AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mac theming: Set background brush for menu palette

Browse Source 
We also remove overriding the background when polishing the palette
in QMacStyle. This is a leftover from pre-10.5 styling.

Change-Id: Icaa6d9c864ab01783d83cc02192981136c417d24
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
This commit is contained in:
Gabriel de Dietrich 2014-03-20 13:59:45 +01:00 committed by The Qt Project
parent 9379dd9410
commit b145c1db00
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/cocoa/qcocoasystemsettings.mm
View File

@ -191,6 +191,8 @@ QHash<QPlatformTheme::Palette, QPalette*> qt_mac_createRolePalettes()
pal.setColor(QPalette::Disabled, QPalette::HighlightedText, qc);
}
if (mac_widget_colors[i].paletteRole == QPlatformTheme::MenuPalette) {
qc = qt_mac_colorForTheme(kThemeBrushMenuBackground);
pal.setBrush(QPalette::Background, qc);
qc = qt_mac_colorForThemeTextColor(kThemeTextColorMenuItemActive);
pal.setBrush(QPalette::ButtonText, qc);
qc = qt_mac_colorForThemeTextColor(kThemeTextColorMenuItemSelected);

5
src/widgets/styles/qmacstyle_mac.mm
View File

@ -1917,11 +1917,6 @@ void QMacStyle::polish(QPalette &pal)
qt_mac_backgroundPattern = new QPixmap(d->generateBackgroundPattern());
}
QColor pc(Qt::black);
pc = qcolorForTheme(kThemeBrushDialogBackgroundActive);
QBrush background(pc, *qt_mac_backgroundPattern);
pal.setBrush(QPalette::All, QPalette::Window, background);
pal.setBrush(QPalette::All, QPalette::Button, background);
QCFString theme;
const OSErr err = CopyThemeIdentifier(&theme);