Attachment 8625 Details for Bug 19641 – external setting of QT_AUTO_SCREEN_SCALE_FACTOR=0

[patch] external setting of QT_AUTO_SCREEN_SCALE_FACTOR=0

plasma-workspace-enable-plasmaqtsettings.patch (text/plain), 1.25 KB, created by Giuseppe Ghibò on 2016-11-05 21:02:57 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Giuseppe Ghibò

Created: 2016-11-05 21:02:57 CET

Size: 1.25 KB

patch

obsolete

>diff -up plasma-workspace-5.8.3/startkde/startkde.cmake.orig plasma-workspace-5.8.3/startkde/startkde.cmake
>--- plasma-workspace-5.8.3/startkde/startkde.cmake.orig	2016-11-04 16:18:52.665649710 +0100
>+++ plasma-workspace-5.8.3/startkde/startkde.cmake	2016-11-04 16:20:07.254615850 +0100
>@@ -145,10 +145,16 @@ fi
> if [ "$kdeglobals_kscreen_screenscalefactors" ]; then
>     export QT_SCREEN_SCALE_FACTORS="$kdeglobals_kscreen_screenscalefactors"
> fi
>-#Manually disable auto scaling because we are scaling above
>-#otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us
>-export QT_AUTO_SCREEN_SCALE_FACTOR=0
>-
>+# Read QT_AUTO_SCREEN_SCALE_FACTOR settings from an external file /etc/sysconfig/plasmaqtsettings
>+# or from $HOME/.plasmaqtsettings. The latter takes precedence.
>+if [ -f $HOME/.plasmaqtsettings ]; then
>+	. $HOME/.plasmaqtsettings > /dev/null 2>&1
>+elif [ -f /etc/sysconfig/plasmaqtsettings ]; then
>+	. /etc/sysconfig/plasmaqtsettings > /dev/null 2>&1
>+fi
>+if [ -n "$QT_AUTO_SCREEN_SCALE_FACTOR" ]; then
>+	export QT_AUTO_SCREEN_SCALE_FACTOR
>+fi
> 
> # XCursor mouse theme needs to be applied here to work even for kded or ksmserver
> if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then

diff -up plasma-workspace-5.8.3/startkde/startkde.cmake.orig plasma-workspace-5.8.3/startkde/startkde.cmake
--- plasma-workspace-5.8.3/startkde/startkde.cmake.orig	2016-11-04 16:18:52.665649710 +0100
+++ plasma-workspace-5.8.3/startkde/startkde.cmake	2016-11-04 16:20:07.254615850 +0100
@@ -145,10 +145,16 @@ fi
 if [ "$kdeglobals_kscreen_screenscalefactors" ]; then
     export QT_SCREEN_SCALE_FACTORS="$kdeglobals_kscreen_screenscalefactors"
 fi
-#Manually disable auto scaling because we are scaling above
-#otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us
-export QT_AUTO_SCREEN_SCALE_FACTOR=0
-
+# Read QT_AUTO_SCREEN_SCALE_FACTOR settings from an external file /etc/sysconfig/plasmaqtsettings
+# or from $HOME/.plasmaqtsettings. The latter takes precedence.
+if [ -f $HOME/.plasmaqtsettings ]; then
+	. $HOME/.plasmaqtsettings > /dev/null 2>&1
+elif [ -f /etc/sysconfig/plasmaqtsettings ]; then
+	. /etc/sysconfig/plasmaqtsettings > /dev/null 2>&1
+fi
+if [ -n "$QT_AUTO_SCREEN_SCALE_FACTOR" ]; then
+	export QT_AUTO_SCREEN_SCALE_FACTOR
+fi
 
 # XCursor mouse theme needs to be applied here to work even for kded or ksmserver
 if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then

Actions: View | Diff

Attachments on bug 19641: 8586 | 8587 | 8588 | 8625 | 8626