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 #7193 from spycrab/qt_mac_bgcolor 

Qt/WrapInScrollArea: Ensure correct macOS background colors
This commit is contained in:
spycrab 2018-07-01 04:02:56 +02:00 committed by GitHub
parent f5730e1636 4bf276e912
commit 8e1425b363
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinQt2/QtUtils/WrapInScrollArea.cpp
View File

@ -30,8 +30,8 @@ QWidget* GetWrappedWidget(QWidget* wrapped_widget, QWidget* to_resize, int margi
std::max(recommended_height, to_resize->height())); std::max(recommended_height, to_resize->height()));
} }
#ifdef _WIN32 #if defined(_WIN32) || defined(__APPLE__)
// Transparency can cause unwanted side-effects on OSes other than Windows // Transparency can cause unwanted side-effects on OSes other than Windows / macOS
// Make sure the background color stays consistent with the parent widget // Make sure the background color stays consistent with the parent widget
QPalette p = wrapped_widget->palette(); QPalette p = wrapped_widget->palette();