From 587178df2b01ec458b0c10636b21b357077289d8 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Sun, 18 Sep 2016 15:57:55 +0100 Subject: [PATCH] Fix wayland high DPI env vars Summary: They were out of sync with the changes I did for XCB for Qt > 5.6 Test Plan: Logged in to a wayland session. Normal sized text, normal sized scrollbars. Reviewers: #plasma, mart Reviewed By: mart Subscribers: mart, plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D2797 --- startkde/startplasmacompositor.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake index 535d1c1fa..79acd712c 100644 --- a/startkde/startplasmacompositor.cmake +++ b/startkde/startplasmacompositor.cmake @@ -101,9 +101,14 @@ 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_scalefactor" ]; then + export QT_SCREEN_SCALE_FACTORS="$kdeglobals_kscreen_scalefactor" 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 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