Skip to content
Permalink
Browse files

Merge pull request #7775 from chargeflux/QComboBoxBGColorFix-macOS

Fix QComboBox background and transparency workaround on macOS
  • Loading branch information...
lioncash committed Mar 4, 2019
2 parents 13b2b93 + 77777cd commit 191ef76da2880e90cd95fc6ffa8e98c237d8b724
Showing with 2 additions and 11 deletions.
  1. +2 −11 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;
}

0 comments on commit 191ef76

Please sign in to comment.
You can’t perform that action at this time.