From b7874f1fabb6cd89962ebbb8ed09a00e1c1ad1ff Mon Sep 17 00:00:00 2001 From: Wladimir Leuschner Date: Mon, 22 Apr 2024 16:56:17 +0200 Subject: [PATCH] QWindows11Style: Initialize colorSchemeIndex/highContrastTheme in ctor When creating a QWindows11Style with QStyleFactory::create() the current colorSchemeIndex and highContrastTheme usage is not set. Those values are now queried and set also in the Constructor of QWindows11Style. Fixes: QTBUG-124524 Pick-to: 6.7 Change-Id: I42a3aa5bafb0ff4193b8644ac1895a78b8c82120 Reviewed-by: Volker Hilsheimer --- src/plugins/styles/modernwindows/qwindows11style.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/styles/modernwindows/qwindows11style.cpp b/src/plugins/styles/modernwindows/qwindows11style.cpp index 3154c3b60b..0501e54ee0 100644 --- a/src/plugins/styles/modernwindows/qwindows11style.cpp +++ b/src/plugins/styles/modernwindows/qwindows11style.cpp @@ -136,6 +136,8 @@ static void drawArrow(const QStyle *style, const QStyleOptionToolButton *toolbut */ QWindows11Style::QWindows11Style() : QWindowsVistaStyle(*new QWindows11StylePrivate) { + highContrastTheme = QGuiApplicationPrivate::styleHints->colorScheme() == Qt::ColorScheme::Unknown; + colorSchemeIndex = QGuiApplicationPrivate::styleHints->colorScheme() == Qt::ColorScheme::Light ? 0 : 1; } /*! @@ -144,6 +146,8 @@ QWindows11Style::QWindows11Style() : QWindowsVistaStyle(*new QWindows11StylePriv */ QWindows11Style::QWindows11Style(QWindows11StylePrivate &dd) : QWindowsVistaStyle(dd) { + highContrastTheme = QGuiApplicationPrivate::styleHints->colorScheme() == Qt::ColorScheme::Unknown; + colorSchemeIndex = QGuiApplicationPrivate::styleHints->colorScheme() == Qt::ColorScheme::Light ? 0 : 1; } /*!