src/gui/widgets/overlay/playermenu: fix unreadable text in dark mode

On Windows if the user enabled dark mode, the text would be unreadable. This is due to a Qt bug as far as I can tell. This makes it so the Alt proxy style isn't used on Windows when dark mode is set. macOS and Linux remain unaffected by this change.
ripose-jp · Jun 23, 2024 · 05d1ef5 · 05d1ef5
1 parent 40973ce
commit 05d1ef5
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 3 deletions.
diff --git a/src/gui/widgets/overlay/playermenu.cpp b/src/gui/widgets/overlay/playermenu.cpp
@@ -44,6 +44,8 @@
 class MenuStyle : public QProxyStyle
 {
 public:
+    using QProxyStyle::QProxyStyle;
+
     int styleHint(
         StyleHint hint,
         const QStyleOption *opt,
@@ -68,7 +70,7 @@ PlayerMenu::PlayerMenu(QWidget *parent)
 {
     m_ui->setupUi(this);
 
-    setStyle(new MenuStyle());
+    initStyle();
 
     updateSubtitlePauseAction();
 
@@ -277,6 +279,11 @@ PlayerMenu::PlayerMenu(QWidget *parent)
         );
     }
 
+    connect(
+        mediator, &GlobalMediator::interfaceSettingsChanged,
+        this,     &PlayerMenu::initStyle
+    );
+
 #ifdef OCR_SUPPORT
     connect(
         mediator, &GlobalMediator::ocrSettingsChanged,
@@ -287,14 +294,54 @@ PlayerMenu::PlayerMenu(QWidget *parent)
 
 PlayerMenu::~PlayerMenu()
 {
+    setStyle(nullptr);
     clearTracks();
     delete m_ui;
 }
 
 /* End Constructor/Destructor */
-#ifdef OCR_SUPPORT
 /* Begin Initializers */
 
+void PlayerMenu::initStyle()
+{
+#ifdef Q_OS_WIN
+    QSettings settings;
+    settings.beginGroup(Constants::Settings::Interface::GROUP);
+    Constants::Theme theme = static_cast<Constants::Theme>(
+        settings.value(
+            Constants::Settings::Interface::THEME,
+            static_cast<int>(Constants::Settings::Interface::THEME_DEFAULT)
+        ).toInt()
+    );
+    settings.endGroup();
+
+    switch (theme)
+    {
+        case Constants::Theme::Dark:
+            /* Not using MenuStyle in dark mode is due to a bug in Qt that
+             * messes up colors on Windows when using a proxy style. This only
+             * makes text unreadable in dark mode. */
+            setStyle(nullptr);
+            break;
+
+        case Constants::Theme::Light:
+        case Constants::Theme::System:
+        default:
+            std::unique_ptr<MenuStyle> menuStyle =
+                std::make_unique<MenuStyle>(QApplication::style());
+            setStyle(menuStyle.get());
+            m_menuStyle = std::move(menuStyle);
+            break;
+    }
+#else
+    std::unique_ptr<MenuStyle> menuStyle =
+        std::make_unique<MenuStyle>(QApplication::style());
+    setStyle(menuStyle.get());
+    m_menuStyle = std::move(menuStyle);
+#endif // Q_OS_WIN
+}
+
+#ifdef OCR_SUPPORT
 void PlayerMenu::initOCRSettings()
 {
     QSettings settings;
@@ -307,9 +354,9 @@ void PlayerMenu::initOCRSettings()
 
     settings.endGroup();
 }
+#endif // OCR_SUPPORT
 
 /* End Initializers */
-#endif // OCR_SUPPORT
 /* Begin Status Methods */
 
 bool PlayerMenu::menuOpen() const

diff --git a/src/gui/widgets/overlay/playermenu.h b/src/gui/widgets/overlay/playermenu.h
@@ -28,6 +28,7 @@
 class QActionGroup;
 class QAction;
 class QMenu;
+class MenuStyle;
 
 namespace Ui
 {
@@ -76,6 +77,11 @@ public Q_SLOTS:
     void aboutToHide() const;
 
 private Q_SLOTS:
+    /**
+     * Initializes the style for the widget.
+     */
+    void initStyle();
+
 #ifdef OCR_SUPPORT
     /**
      * Initializes menus with regards to OCR Settings.
@@ -231,6 +237,9 @@ private Q_SLOTS:
 
     /* A saved pointer to the player */
     PlayerAdapter *m_player;
+
+    /* The menu style object. QWidget does not take ownership. */
+    std::unique_ptr<MenuStyle> m_menuStyle;
 };
 
 #endif // PLAYERMENU_H