From 6b469e469fac43f8b46687697314f40c7c18560e Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 19 May 2022 09:03:13 +0400 Subject: [PATCH] Get rid of DisableCustomScaling hack This shouldn't be needed since Qt is built without High-DPI scaling support in official binaries and QT_SCALE_FACTOR is a debug environment variable, so any use of it is a user's environment misconfiguration. https://doc.qt.io/qt-6/highdpi.html#environment-variable-reference --- ui/ui_utility.cpp | 6 ------ ui/ui_utility.h | 2 -- 2 files changed, 8 deletions(-) diff --git a/ui/ui_utility.cpp b/ui/ui_utility.cpp index e66055d..1086704 100644 --- a/ui/ui_utility.cpp +++ b/ui/ui_utility.cpp @@ -14,7 +14,6 @@ #include #include -#include #include #include @@ -214,11 +213,6 @@ bool IsContentVisible( && !widget->window()->isMinimized(); } -void DisableCustomScaling() { - QHighDpiScaling::setGlobalFactor(1); - QGuiApplicationPrivate::resetCachedDevicePixelRatio(); -} - int WheelDirection(not_null e) { // Only a mouse wheel is accepted. constexpr auto step = static_cast(QWheelEvent::DefaultDeltasPerStep); diff --git a/ui/ui_utility.h b/ui/ui_utility.h index 80764f9..420f0ff 100644 --- a/ui/ui_utility.h +++ b/ui/ui_utility.h @@ -194,8 +194,6 @@ QPointer MakeWeak(not_null object) { not_null widget, const QRect &rect = QRect()); -void DisableCustomScaling(); - int WheelDirection(not_null e); } // namespace Ui