diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2025-06-02 23:34:05 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2025-06-03 21:07:34 +0200 |
| commit | c7625d14df4e6acfa3679cb227bdef64c98c701c (patch) | |
| tree | e7bc5e78209e0d35dcc17c72abf7dc3e4c77a614 /src | |
| parent | 3056da6711933d035be14394d6ea9fe72c1aabe9 (diff) | |
Decouple QApplication::isEffectEnabled from QColormap
Change-Id: I26468cc528d2c516492db11ca4109e6be63c1b5a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/kernel/qapplication.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 0b6e0cd8f70..8a041a4ac2c 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -3640,7 +3640,9 @@ void QApplication::setEffectEnabled(Qt::UIEffect effect, bool enable) bool QApplication::isEffectEnabled(Qt::UIEffect effect) { CHECK_QAPP_INSTANCE(false) - return QColormap::instance().depth() >= 16 + const auto primaryScreenDepth = QGuiApplication::primaryScreen() ? + QGuiApplication::primaryScreen()->depth() : 24; + return primaryScreenDepth >= 16 && (QApplicationPrivate::enabledAnimations & QPlatformTheme::GeneralUiEffect) && (QApplicationPrivate::enabledAnimations & uiEffectToFlag(effect)); } |