diff options
| author | Weblate <noreply@weblate.org> | 2017-08-06 00:02:16 +0000 |
|---|---|---|
| committer | Weblate <noreply@weblate.org> | 2017-08-06 00:02:16 +0000 |
| commit | b1df5e55259c76e6ca963cf0af25e20ee4a1897d (patch) | |
| tree | 770cbcbc98cc24416d43282ca7f37c1a3cd7309a /src-qt5/core/lumina-desktop | |
| parent | Translated using Weblate (French) (diff) | |
| parent | Make sure the "start-lumina-desktop" routine will detect/adjust the X11 Displ... (diff) | |
| download | lumina-b1df5e55259c76e6ca963cf0af25e20ee4a1897d.tar.gz lumina-b1df5e55259c76e6ca963cf0af25e20ee4a1897d.tar.bz2 lumina-b1df5e55259c76e6ca963cf0af25e20ee4a1897d.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src-qt5/core/lumina-desktop')
| -rw-r--r-- | src-qt5/core/lumina-desktop/main.cpp | 4 | ||||
| -rw-r--r-- | src-qt5/core/lumina-desktop/panel-plugins/clock/LClock.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src-qt5/core/lumina-desktop/main.cpp b/src-qt5/core/lumina-desktop/main.cpp index 1b0e5e4d..6017cad7 100644 --- a/src-qt5/core/lumina-desktop/main.cpp +++ b/src-qt5/core/lumina-desktop/main.cpp @@ -72,8 +72,8 @@ int main(int argc, char ** argv) LXDG::setEnvironmentVars(); setenv("DESKTOP_SESSION","Lumina",1); setenv("XDG_CURRENT_DESKTOP","Lumina",1); - unsetenv("QT_QPA_PLATFORMTHEME"); //causes issues with Lumina themes - not many people have this by default... - //setenv("QT_QPA_PLATFORMTHEME", "lthemeengine"); + //unsetenv("QT_QPA_PLATFORMTHEME"); //causes issues with Lumina themes - not many people have this by default... + setenv("QT_QPA_PLATFORMTHEME", "lthemeengine", 1); unsetenv("QT_AUTO_SCREEN_SCALE_FACTOR"); //causes pixel-specific scaling issues with the desktop - turn this on after-the-fact for other apps //Startup the session LSession a(argc, argv); diff --git a/src-qt5/core/lumina-desktop/panel-plugins/clock/LClock.cpp b/src-qt5/core/lumina-desktop/panel-plugins/clock/LClock.cpp index bdf9b27e..db661841 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/clock/LClock.cpp +++ b/src-qt5/core/lumina-desktop/panel-plugins/clock/LClock.cpp @@ -102,7 +102,7 @@ void LClock::updateTime(bool adjustformat){ lwid = metrics.width(lines[i]); if(lwid>wid){ wid = lwid; } } - this->setMinimumWidth( wid - (4*metrics.width("O")) ); + this->setMinimumWidth(wid); this->setMaximumWidth(wid + (4*metrics.width("O"))); }else{ //vertical layout |