diff --git a/CHANGELOG.md b/CHANGELOG.md index a8dda16e..02f8116b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,10 +3,11 @@ All notable changes to this project will be documented in this file. ## [Unreleased] -## [2024.12.1] - 2024-12-08 +## [2024.12.1] - 2024-12-09 A quick-fix release, mostly for Windows users: - Microsoft broke a basic system library and now the BrickStore installer has to force a system reboot on installation in case that system library is too old. +- The Windows 11 native *Light* theme still has a few problems with colors, so BrickStore is switching back to using the old Windows 10 style for the time being. - The Android package erroneously reported a minimum version of Android 6.0 (Marshmallow), but BrickStore really needs at least 9.0 (Pie). diff --git a/src/desktop/desktopapplication.cpp b/src/desktop/desktopapplication.cpp index 8bfb95c3..87c40f5d 100755 --- a/src/desktop/desktopapplication.cpp +++ b/src/desktop/desktopapplication.cpp @@ -349,11 +349,6 @@ void DesktopApplication::setUITheme() // no need to use Fusion tricks here, just use the default Vista style theme = Config::UITheme::SystemDefault; } - if ((QSysInfo::productVersion().toInt() >= 11) && (theme != Config::UITheme::Dark)) { - // The new Windows 11 style looks awful as of 6.8.0 - theme = Config::UITheme::Light; - QGuiApplication::setDesktopSettingsAware(false); - } if (theme == Config::UITheme::Dark) { // prevent Win11 palette updates when the system theme or screen settings change QGuiApplication::setDesktopSettingsAware(false); @@ -391,6 +386,10 @@ void DesktopApplication::setUITheme() QApplication::setPalette(palette); QToolTip::setPalette(palette); + } else if (QSysInfo::productVersion().toInt() >= 11) { + // The new Windows 11 style still has problems as of 6.8.1 + QGuiApplication::setDesktopSettingsAware(false); + QApplication::setStyle(new BrickStoreProxyStyle(QStyleFactory::create(u"windowsvista"_qs))); } else { QApplication::setStyle(new BrickStoreProxyStyle()); }