diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-02-27 08:46:47 +0100 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2019-08-23 03:41:03 +0200 |
| commit | 35da4eeba263db411d929fd278a4617dd7cf5c22 (patch) | |
| tree | 9bedacd57a0b9b8870347d85309909ae6f88aeb4 /src/gui/kernel/qhighdpiscaling_p.h | |
| parent | 70a893e9bee7c1b8994a1218038a302e406d0aa3 (diff) | |
Update QT_SCREEN_SCALE_FACTORS
Store name->factor associations in a global QHash instead of on the
QScreen object, making them survive QScreen object deletion, for
example on disconnect/ connect cycles.
Make factors set with QT_SCREEN_SCALE_FACTORS override the screen
factors computed from platform plugin DPI values. This matches the use
case for QT_SCREEN_SCALE_FACTORS (but not the general scale factors
combine by multiplication”principle)
Done-with: Friedemann Kleint <Friedemann.Kleint@qt.io>
Task-number: QTBUG-53022
Change-Id: I12771249314ab0c073e609d62f57ac0d18d3b6ce
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/gui/kernel/qhighdpiscaling_p.h')
| -rw-r--r-- | src/gui/kernel/qhighdpiscaling_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qhighdpiscaling_p.h b/src/gui/kernel/qhighdpiscaling_p.h index e24628a69a..9c24fa506d 100644 --- a/src/gui/kernel/qhighdpiscaling_p.h +++ b/src/gui/kernel/qhighdpiscaling_p.h @@ -102,7 +102,7 @@ public: static void initHighDpiScaling(); static void updateHighDpiScaling(); static void setGlobalFactor(qreal factor); - static void setScreenFactor(QScreen *window, qreal factor); + static void setScreenFactor(QScreen *screen, qreal factor); static bool isActive() { return m_active; } |