From bec8a58da12a18e88ac2c8fc4645103931a1d71a 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 Change-Id: I42a3aa5bafb0ff4193b8644ac1895a78b8c82120 Reviewed-by: Volker Hilsheimer (cherry picked from commit b7874f1fabb6cd89962ebbb8ed09a00e1c1ad1ff) Reviewed-by: Qt Cherry-pick Bot --- 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 e7dd3aa7a13..28fa474e8f0 100644 --- a/src/plugins/styles/modernwindows/qwindows11style.cpp +++ b/src/plugins/styles/modernwindows/qwindows11style.cpp @@ -134,6 +134,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; } /*! @@ -142,6 +144,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; } /*!