Per window scale factor setting

./highdpi --window-scale-factor --mainwindow

Also fix a couple of scaling logic bugs.

2 files changed, 3 insertions, 2 deletions

diff --git a/src/gui/kernel/qhighdpiscaling.cpp b/src/gui/kernel/qhighdpiscaling.cpp
index 8ea1735cd1..f4490dccae 100644
--- a/src/gui/kernel/qhighdpiscaling.cpp
+++ b/src/gui/kernel/qhighdpiscaling.cpp
@@ -98,13 +98,14 @@ static const char *scaleFactorProperty = "_q_scaleFactor";
 
 void QHighDpiScaling::setWindowFactor(QWindow *window, qreal factor)
 {
+    m_active = true;
     m_perWindowActive = true;
     window->setProperty(scaleFactorProperty, QVariant(factor));
 }
 
 qreal QHighDpiScaling::factor(const QWindow *window)
 {
-    if (m_perWindowActive || window == 0)
+    if (!m_perWindowActive || window == 0)
         return m_factor;
 
     QVariant windowFactor = window->property(scaleFactorProperty);
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index c7493a8409..eb43c30de5 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -1088,7 +1088,7 @@ qreal QWindow::devicePixelRatio() const
     // correct for single-display systems (a very common case).
     if (!d->platformWindow)
         return qApp->devicePixelRatio();
-    return d->platformWindow->devicePixelRatio() * QHighDpiScaling::factor();
+    return d->platformWindow->devicePixelRatio() * QHighDpiScaling::factor(this);
 }
 
 /*!