diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-07-28 14:53:14 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-07-28 14:59:47 (GMT) |
| commit | 0318f0d5a43a78831f3bf4cb043d0b2b41cd9987 (patch) | |
| tree | e905f93728b377475383560ddfbd8a8905df194f /src/gui/styles | |
| parent | 14eee3f6bb93f7b31f07c019b6a5262f8d2a3ecf (diff) | |
| download | Qt-0318f0d5a43a78831f3bf4cb043d0b2b41cd9987.zip Qt-0318f0d5a43a78831f3bf4cb043d0b2b41cd9987.tar.gz Qt-0318f0d5a43a78831f3bf4cb043d0b2b41cd9987.tar.bz2 | |
QMenu and QStyleSheetStyle: fix setting a border.
The native border would be drawn over the one drawn by the QStyleSheetStyle
Regression since 68a498284e206e2bb000bc35331c966f3790f607
Reviewed-by: Gabriel
Task-number: QTBUG-10785
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qstylesheetstyle.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp index 43fa4b9..dff525e 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -4283,6 +4283,13 @@ void QStyleSheetStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *op } break; + case PE_FrameMenu: + if (rule.hasDrawable()) { + // Drawn by PE_PanelMenu + return; + } + break; + case PE_PanelMenuBar: if (rule.hasDrawable()) { // Drawn by PE_Widget |