From fdc41babd49e939c5534132409229841e336c647 Mon Sep 17 00:00:00 2001
From: tomboylover93 <95257311+tomboylover93@users.noreply.github.com>
Date: Thu, 19 Dec 2024 08:07:52 -0300
Subject: [PATCH] Small tweaks to widget style configuration method

---
 src/qt_gui/main_window.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/qt_gui/main_window.cpp b/src/qt_gui/main_window.cpp
index e82141cf7..7f279826e 100644
--- a/src/qt_gui/main_window.cpp
+++ b/src/qt_gui/main_window.cpp
@@ -119,11 +119,21 @@ void MainWindow::CreateActions() {
 
 void MainWindow::AddUiWidgets() {
     // add toolbar widgets
+    static QString s_system_style_name;
+    static bool s_system_style_name_set;
+
+    if (!s_system_style_name_set) {
+        s_system_style_name_set = true;
+        s_system_style_name = QApplication::style()->objectName();
+    }
+
     std::string widget_style = Config::getWidgetStyle();
     if (widget_style == "Fusion") {
-        QApplication::setStyle("Fusion");
+        qApp->setStyle(QStyleFactory::create("Fusion"));
+        qApp->setStyleSheet(QString());
     } else if (widget_style == "System") {
-        QApplication::style()->objectName();
+        qApp->setStyle(s_system_style_name);
+        qApp->setStyleSheet(QString());
     }
     ui->toolBar->setObjectName("mw_toolbar");
     ui->toolBar->addWidget(ui->playButton);