Commit 0fa58f0a authored by David Edmundson's avatar David Edmundson

Determine if we should use Qt scaling based on env var

Summary:
KWindowSystem::platform() cannot be used before QApplication is
constructed.

QCoreApplication::setAttribute needs to be called before QApplication is
constructed.

We need a different method. I've used an explicit new env variable so
that some users can also opt in to use this when on X.

Test Plan:
Logged in.
Plasma panels all work. Look to be native resolution.

Reviewers: #plasma, mart

Reviewed By: #plasma, mart

Subscribers: mart, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D7200
parent 7e2c616f
......@@ -27,7 +27,6 @@
#include <KAboutData>
#include <KQuickAddons/QtQuickSettings>
#include <KWindowSystem>
#include <kdbusservice.h>
#include <klocalizedstring.h>
......@@ -50,7 +49,7 @@ int main(int argc, char *argv[])
//On wayland, it's different. Everything is simpler as all co-ordinates are in the same co-ordinate system
//we don't have fractional scaling on the client so don't hit most the remaining bugs and
//even if we don't use Qt scaling the compositor will try to scale us anyway so we have no choice
if (KWindowSystem::isPlatformX11()) {
if (!qEnvironmentVariableIsSet("PLASMA_USE_QT_SCALING")) {
qunsetenv("QT_DEVICE_PIXEL_RATIO");
QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
}
......
......@@ -54,6 +54,9 @@ fi
#for QtQuickControlsStyle and Kirigami
export QT_QUICK_CONTROLS_STYLE=org.kde.desktop
#In wayland we want Plasma to use Qt's scaling
export PLASMA_USE_QT_SCALING=1
# Activate the kde font directories.
#
# There are 4 directories that may be used for supplying fonts for KDE.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment