Merge pull request #7775 from chargeflux/QComboBoxBGColorFix-macOS

Fix QComboBox background and transparency workaround on macOS

1 files changed, 2 insertions, 11 deletions

diff --git a/Source/Core/DolphinQt/QtUtils/WrapInScrollArea.cpp b/Source/Core/DolphinQt/QtUtils/WrapInScrollArea.cpp
index d06f7b957f..11758dd47a 100644
--- a/Source/Core/DolphinQt/QtUtils/WrapInScrollArea.cpp
+++ b/Source/Core/DolphinQt/QtUtils/WrapInScrollArea.cpp
@@ -30,17 +30,8 @@ QWidget* GetWrappedWidget(QWidget* wrapped_widget, QWidget* to_resize, int margi
                       std::max(recommended_height, to_resize->height()));
   }
 
-#if defined(_WIN32) || defined(__APPLE__)
-  // Transparency can cause unwanted side-effects on OSes other than Windows / macOS
-
-  // Make sure the background color stays consistent with the parent widget
-  QPalette p = wrapped_widget->palette();
-
-  p.setColor(QPalette::Window, QColor(0, 0, 0, 0));
-
-  wrapped_widget->setPalette(p);
-  scroll->setPalette(p);
-#endif
+  scroll->viewport()->setAutoFillBackground(false);
+  wrapped_widget->setAutoFillBackground(false);
 
   return scroll;
 }