ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7775 from chargeflux/QComboBoxBGColorFix-macOS 

Fix QComboBox background and transparency workaround on macOS
This commit is contained in:
Mat M 2019-03-03 20:52:32 -05:00 committed by GitHub
parent 13b2b93d3d 77777cd1d7
commit 191ef76da2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/DolphinQt/QtUtils/WrapInScrollArea.cpp
View File

@ -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;
}