chore: Move s_logicalDpiFactorOverride to Platform_qt

So it can be reused for Slint for now
KDAB · Aug 2, 2024 · ed6f4f6 · ed6f4f6
1 parent bf0b7e4
commit ed6f4f6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/src/qtcommon/Platform.cpp b/src/qtcommon/Platform.cpp
@@ -181,14 +181,16 @@ Platform_qt::Platform_qt()
 
 #ifdef DOCKS_DEVELOPER_MODE
 
+int Platform_qt::s_logicalDpiFactorOverride = 0;
+
 // ctor used by the tests only
 Platform_qt::Platform_qt(QCoreApplication *)
     : m_globalEventFilter(new GlobalEventFilter(this))
 {
     // We want stability during tests.
     // QMainWindow uses the factor for its margins, we don't want tests failing due
     // to off by 1 or 2 pixels. Use 96dpi everywhere.
-    View_qt::s_logicalDpiFactorOverride = 1;
+    Platform_qt::s_logicalDpiFactorOverride = 1;
 }
 
 #endif

diff --git a/src/qtcommon/Platform.h b/src/qtcommon/Platform.h
@@ -104,6 +104,8 @@ class DOCKS_EXPORT Platform_qt : public Core::Platform
     bool tests_waitForDeleted(Core::View *, int timeout = 2000) const override;
     bool tests_waitForDeleted(Core::Controller *, int timeout = 2000) const override;
 
+    static int s_logicalDpiFactorOverride;
+
 #endif
 
 protected:

diff --git a/src/qtcommon/View.cpp b/src/qtcommon/View.cpp
@@ -28,10 +28,6 @@ using namespace KDDockWidgets::QtCommon;
 // clazy:excludeall=missing-qobject-macro
 
 
-#if defined(DOCKS_DEVELOPER_MODE)
-int View_qt::s_logicalDpiFactorOverride = 0;
-#endif
-
 class View_qt::EventFilter : public QObject
 {
 public:

diff --git a/src/qtwidgets/views/View.h b/src/qtwidgets/views/View.h
@@ -16,6 +16,7 @@
 
 #include "kddockwidgets/core/Controller.h"
 #include "kddockwidgets/qtcommon/View.h"
+#include "kddockwidgets/qtcommon/Platform.h"
 
 #include <QDebug>
 #include <QEvent>
@@ -410,8 +411,8 @@ class DOCKS_EXPORT View : public Base, public QtCommon::View_qt
 inline qreal logicalDpiFactor(const QWidget *w)
 {
 #ifdef DOCKS_DEVELOPER_MODE
-    if (QtCommon::View_qt::s_logicalDpiFactorOverride > 0)
-        return QtCommon::View_qt::s_logicalDpiFactorOverride;
+    if (QtCommon::Platform_qt::s_logicalDpiFactorOverride > 0)
+        return QtCommon::Platform_qt::s_logicalDpiFactorOverride;
 #endif
 
 #ifdef Q_OS_MACOS