From 1df7279384550249717061c28bf2d914801d28db Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 23 Aug 2016 08:22:11 -0500 Subject: [PATCH] kde5.startkde: update from plasma-workspace-5.7.3 * Read the screen scale factor (for HiDPI displays) from KScreen correctly. * Disable automaticy scale factor detection in Qt applications. * Force font DPI at startup, if requested. * Allow kded to invoke kbuildsycoca5 automatically. --- .../kde-5/plasma/startkde/startkde.sh | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh index c0d5f6dbf59..5d415062235 100755 --- a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh +++ b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh @@ -119,9 +119,12 @@ if test $returncode -ne 0; then fi [ -r $configDir/startupconfig ] && . $configDir/startupconfig -if test "$kdeglobals_kscreen_scalefactor" -ne 1; then - export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor +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 XCURSOR_PATH=~/.icons IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS" @@ -159,6 +162,12 @@ unset THEME # xsetroot -cursor_name left_ptr +if test "$kcmfonts_general_forcefontdpi" -ne 0; then + xrdb -quiet -merge -nocpp <