From 97d26da69ddbac4d6772a42222cdb97e932c8747 Mon Sep 17 00:00:00 2001
From: CJBok <cjbok@ziggo.nl>
Date: Sat, 28 Dec 2019 23:52:56 +0100
Subject: [PATCH] updated stylesheet for all themes.

---
 dist/qt_themes/colorful/style.qrc  |  2 +-
 dist/qt_themes/colorful/style.qss  |  4 ----
 dist/qt_themes/default/default.qrc | 13 +++--------
 dist/qt_themes/default/style.qss   | 35 ++++++++++++++++++++++++++++++
 src/yuzu/main.cpp                  | 18 ++++++++++-----
 5 files changed, 51 insertions(+), 21 deletions(-)
 delete mode 100644 dist/qt_themes/colorful/style.qss
 create mode 100644 dist/qt_themes/default/style.qss

diff --git a/dist/qt_themes/colorful/style.qrc b/dist/qt_themes/colorful/style.qrc
index af2f3fd561..36735519a5 100644
--- a/dist/qt_themes/colorful/style.qrc
+++ b/dist/qt_themes/colorful/style.qrc
@@ -10,6 +10,6 @@
         <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
     </qresource>
     <qresource prefix="colorful">
-        <file>style.qss</file>
+        <file alias="style.qss">../default/style.qss</file>
     </qresource>
 </RCC>
diff --git a/dist/qt_themes/colorful/style.qss b/dist/qt_themes/colorful/style.qss
deleted file mode 100644
index 413fc81da7..0000000000
--- a/dist/qt_themes/colorful/style.qss
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
-    This file is intentionally left blank.
-    We do not want to apply any stylesheet for colorful, only icons.
-*/
diff --git a/dist/qt_themes/default/default.qrc b/dist/qt_themes/default/default.qrc
index d1a0ee1bea..c51fdb26cc 100644
--- a/dist/qt_themes/default/default.qrc
+++ b/dist/qt_themes/default/default.qrc
@@ -1,25 +1,18 @@
 <RCC>
     <qresource prefix="icons/default">
         <file alias="index.theme">icons/index.theme</file>
-      
         <file alias="16x16/checked.png">icons/16x16/checked.png</file>
-
         <file alias="16x16/failed.png">icons/16x16/failed.png</file>
-
         <file alias="16x16/lock.png">icons/16x16/lock.png</file>
-
         <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file>
-      
         <file alias="48x48/chip.png">icons/48x48/chip.png</file>
-
         <file alias="48x48/folder.png">icons/48x48/folder.png</file>
-
         <file alias="48x48/plus.png">icons/48x48/plus.png</file>
-      
         <file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file>
-      
         <file alias="256x256/yuzu.png">icons/256x256/yuzu.png</file>
-
         <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
     </qresource>
+    <qresource prefix="default">
+        <file>style.qss</file>
+    </qresource>
 </RCC>
diff --git a/dist/qt_themes/default/style.qss b/dist/qt_themes/default/style.qss
new file mode 100644
index 0000000000..5e0d1caefe
--- /dev/null
+++ b/dist/qt_themes/default/style.qss
@@ -0,0 +1,35 @@
+QPushButton#StatusBarToggleButton {
+    color: #959595;
+    border: 1px solid transparent;
+    background-color: transparent;
+    padding: 0px 3px 0px 3px;
+    text-align: center;
+}
+
+QPushButton#StatusBarToggleButton:checked {
+    color: #000000;
+}
+
+QPushButton#StatusBarToggleButton:hover {
+    border: 1px solid #76797C;
+}
+
+QPushButton#RendererStatusBarButton {
+    color: #656565;
+    border: 1px solid transparent;
+    background-color: transparent;
+    padding: 0px 3px 0px 3px;
+    text-align: center;
+}
+
+QPushButton#RendererStatusBarButton:hover {
+    border: 1px solid #76797C;
+}
+
+QPushButton#RendererStatusBarButton:checked {
+    color: #e85c00;
+}
+
+QPushButton#RendererStatusBarButton:!checked{
+    color: #0066ff;
+}
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 33918a2753..d287f24f24 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -481,7 +481,7 @@ void GMainWindow::InitializeWidgets() {
 
     async_status_button = new QPushButton();
     async_status_button->setText(tr("ASYNC"));
-    async_status_button->setObjectName(tr("StatusButton"));
+    async_status_button->setObjectName(tr("StatusBarToggleButton"));
     async_status_button->setCheckable(true);
     async_status_button->setChecked(Settings::values.use_asynchronous_gpu_emulation);
     statusBar()->addPermanentWidget(async_status_button, 0);
@@ -504,9 +504,7 @@ void GMainWindow::InitializeWidgets() {
     renderer_status_button->setChecked(false);
     renderer_status_button->setDisabled(true);
 #endif // HAS_VULKAN
-    renderer_status_button->setObjectName(tr("StatusButton"));
-    renderer_status_button->setStyleSheet(QStringLiteral("QPushButton:checked{color: #e85c00;}"
-                                                         "QPushButton:!checked{color: #00ccdd;}"));
+    renderer_status_button->setObjectName(tr("RendererStatusBarButton"));
     statusBar()->addPermanentWidget(renderer_status_button, 0);
 
     statusBar()->setVisible(true);
@@ -2377,8 +2375,16 @@ void GMainWindow::UpdateUITheme() {
     QStringList theme_paths(default_theme_paths);
 
     if (is_default_theme || current_theme.isEmpty()) {
-        qApp->setStyleSheet({});
-        setStyleSheet({});
+        const QString theme_uri(QLatin1Char{':'} + QStringLiteral("default/style.qss"));
+        QFile f(theme_uri);
+        if (f.open(QFile::ReadOnly | QFile::Text)) {
+            QTextStream ts(&f);
+            qApp->setStyleSheet(ts.readAll());
+            setStyleSheet(ts.readAll());
+        } else {
+            qApp->setStyleSheet({});
+            setStyleSheet({});
+        }
         theme_paths.append(default_icons);
         QIcon::setThemeName(default_icons);
     } else {