address changing to fusion on mac, move the dropdown

Author: Sightem

gui/qt/mainwindow.cpp

@@ -1143,17 +1143,6 @@ void MainWindow::translateExtras(int init) {
     }
 }
 
-static void repolishAfterThemeChanged() {
-    const auto widgets = QApplication::allWidgets();
-    for (QWidget *w : widgets) {
-        if (QStyle *st = w->style()) {
-            st->unpolish(w);
-            st->polish(w);
-        }
-        w->update();
-    }
-}
-
 void MainWindow::applyThemeFromPreference() {
     Qt::ColorScheme scheme = Qt::ColorScheme::Unknown;
     bool explicitScheme = false;
@@ -1185,6 +1174,8 @@ void MainWindow::applyThemeFromPreference() {
             }
         }
     }
+#elif defined(Q_OS_MACOS)
+    Q_UNUSED(explicitScheme);
 #else
     if (explicitScheme) {
         if (QStyle *fusion = QStyleFactory::create("Fusion"_L1)) {
@@ -1195,7 +1186,6 @@ void MainWindow::applyThemeFromPreference() {
 
     const bool dark = (qApp->styleHints()->colorScheme() == Qt::ColorScheme::Dark);
     darkModeSwitch(dark);
-    repolishAfterThemeChanged();
 }
 
 void MainWindow::darkModeSwitch(bool darkMode) {
@@ -1227,7 +1217,6 @@ void MainWindow::changeEvent(QEvent* event) {
         eventType == QEvent::PaletteChange) {
         const bool dark = (qApp->styleHints()->colorScheme() == Qt::ColorScheme::Dark);
         darkModeSwitch(dark);
-        repolishAfterThemeChanged();
     }
 }
 

gui/qt/mainwindow.ui

@@ -7682,7 +7682,7 @@
                  </item>
                 </widget>
                </item>
-               <item row="0" column="8">
+               <item row="0" column="10">
                 <spacer name="horizontalSpacer_7">
                  <property name="orientation">
                   <enum>Qt::Horizontal</enum>
@@ -7771,15 +7771,30 @@
                  </property>
                 </spacer>
                </item>
-                <item row="1" column="0">
+                <item row="0" column="8">
                  <widget class="QLabel" name="labelTheme">
                   <property name="text">
                    <string>Theme:</string>
                   </property>
                  </widget>
                 </item>
-                <item row="1" column="1" colspan="7">
+                <item row="0" column="9">
                  <widget class="QComboBox" name="comboTheme">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
+                  </property>
+                  <property name="sizeAdjustPolicy">
+                   <enum>QComboBox::AdjustToContents</enum>
+                  </property>
+                  <property name="maximumSize">
+                   <size>
+                    <width>200</width>
+                    <height>16777215</height>
+                   </size>
+                  </property>
                   <item>
                    <property name="text">
                     <string>System Default</string>
@@ -7797,19 +7812,6 @@
                   </item>
                  </widget>
                 </item>
-                <item row="1" column="8">
-                 <spacer name="horizontalSpacerTheme">
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>0</width>
-                    <height>20</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
               </layout>
              </widget>
             </item>