From 31db46516d5dd4a11786a24fa2b99fc7d6c680c3 Mon Sep 17 00:00:00 2001
From: BearOso <bearoso@gmail.com>
Date: Mon, 15 Apr 2024 15:51:41 -0500
Subject: [PATCH] Qt/Windows: Don't use new windows11 style with Qt 6.7.

It has some glitches.
---
 qt/src/EmuSettingsWindow.ui | 18 +++++-------------
 qt/src/main.cpp             |  7 +++++++
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/qt/src/EmuSettingsWindow.ui b/qt/src/EmuSettingsWindow.ui
index 7b0d71ef..b2f3c18c 100644
--- a/qt/src/EmuSettingsWindow.ui
+++ b/qt/src/EmuSettingsWindow.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="focusPolicy">
-   <enum>Qt::NoFocus</enum>
+   <enum>Qt::FocusPolicy::NoFocus</enum>
   </property>
   <property name="windowTitle">
    <string>Settings</string>
@@ -28,10 +28,10 @@
         </sizepolicy>
        </property>
        <property name="sizeAdjustPolicy">
-        <enum>QAbstractScrollArea::AdjustToContents</enum>
+        <enum>QAbstractScrollArea::SizeAdjustPolicy::AdjustToContents</enum>
        </property>
        <property name="resizeMode">
-        <enum>QListView::Fixed</enum>
+        <enum>QListView::ResizeMode::Fixed</enum>
        </property>
        <item>
         <property name="text">
@@ -115,7 +115,7 @@
      <item>
       <widget class="QPushButton" name="defaultsButton">
        <property name="focusPolicy">
-        <enum>Qt::TabFocus</enum>
+        <enum>Qt::FocusPolicy::TabFocus</enum>
        </property>
        <property name="toolTip">
         <string>Restore all settings on the current page to their default values.</string>
@@ -126,10 +126,6 @@
        <property name="text">
         <string>Restore Defaults</string>
        </property>
-       <property name="icon">
-        <iconset theme="view-refresh">
-         <normaloff>.</normaloff>.</iconset>
-       </property>
        <property name="autoDefault">
         <bool>false</bool>
        </property>
@@ -151,7 +147,7 @@
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -166,10 +162,6 @@
        <property name="text">
         <string>Close</string>
        </property>
-       <property name="icon">
-        <iconset theme="window-close">
-         <normaloff>.</normaloff>.</iconset>
-       </property>
       </widget>
      </item>
     </layout>
diff --git a/qt/src/main.cpp b/qt/src/main.cpp
index d2c4fd34..c726ba5b 100644
--- a/qt/src/main.cpp
+++ b/qt/src/main.cpp
@@ -5,6 +5,7 @@
 
 #include <clocale>
 #include <qnamespace.h>
+#include <QStyle>
 
 #ifndef _WIN32
 #include <csignal>
@@ -25,6 +26,12 @@ int main(int argc, char *argv[])
 
     QGuiApplication::setDesktopFileName("snes9x-gtk");
 
+    if (emu.qtapp->platformName() == "windows")
+    {
+        if (emu.qtapp->style()->name() == "windows11")
+            emu.qtapp->setStyle("windowsvista");
+    }
+
 #ifndef _WIN32
     auto quit_handler = [](int) { QApplication::quit(); };
     for (auto s : { SIGQUIT, SIGINT, SIGTERM, SIGHUP })