1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QWindowsVistaStyle: Fix CE_MenuBarItem with QStyleSheetStyle.

Browse Source 
Do not paint over CE_MenuBarItem when the palette is set
to transparent by QStyleSheetStyle.

Task-number: QTBUG-49115
Change-Id: Ib364017179d0852490daad094361eae0ead4fd5f
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
This commit is contained in:
Friedemann Kleint 2015-11-04 15:14:43 +01:00 committed by Friedemann Kleint
parent 721d7d383d
commit 2fe10c8dd0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/styles/qwindowsvistastyle.cpp
View File

@ -1143,7 +1143,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
if (!proxy()->styleHint(SH_UnderlineShortcut, mbi, widget)) if (!proxy()->styleHint(SH_UnderlineShortcut, mbi, widget))
alignment |= Qt::TextHideMnemonic; alignment |= Qt::TextHideMnemonic;
if (widget) { // Not needed for QtQuick Controls if (widget && mbi->palette.color(QPalette::Window) != Qt::transparent) { // Not needed for QtQuick Controls
//The rect adjustment is a workaround for the menu not really filling its background. //The rect adjustment is a workaround for the menu not really filling its background.
XPThemeData theme(widget, painter, XPThemeData theme(widget, painter,
QWindowsXPStylePrivate::MenuTheme, QWindowsXPStylePrivate::MenuTheme,