diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-19 11:22:17 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-11-19 12:35:47 (GMT) |
| commit | cc791825fc0e4b77a2c21ab069b8e98d9686cbe3 (patch) | |
| tree | 9e4dadc49384ed0a32b43501b5cb799bf1636b6d /src | |
| parent | 0344f409d4727c909c4d4176c687168d8147259a (diff) | |
| download | Qt-cc791825fc0e4b77a2c21ab069b8e98d9686cbe3.zip Qt-cc791825fc0e4b77a2c21ab069b8e98d9686cbe3.tar.gz Qt-cc791825fc0e4b77a2c21ab069b8e98d9686cbe3.tar.bz2 | |
Fix QCombobox painting regression on Windows
Some style relies on this broken behaviour that was fixed in commit
e1a81c96790bee72ee4fbd2b0c4a7b48078c4ec1
The text on the combobox uses the wrong palette role.
Reviewed-by: jbache
(cherry picked from commit a1e1867ae3cac6b54cd06e9fc0ad1aa0b476fe9d)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/styles/qwindowsstyle.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/gui/styles/qwindowsstyle.cpp index ab0b055..bc0b3a3 100644 --- a/src/gui/styles/qwindowsstyle.cpp +++ b/src/gui/styles/qwindowsstyle.cpp @@ -2989,7 +2989,6 @@ void QWindowsStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComp #ifndef QT_NO_COMBOBOX case CC_ComboBox: if (const QStyleOptionComboBox *cmb = qstyleoption_cast<const QStyleOptionComboBox *>(opt)) { - p->save(); QBrush editBrush = cmb->palette.brush(QPalette::Base); if ((cmb->subControls & SC_ComboBoxFrame)) { if (cmb->frame) { @@ -3059,7 +3058,6 @@ void QWindowsStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComp proxy()->drawPrimitive(PE_FrameFocusRect, &focus, p, widget); } } - p->restore(); } break; #endif // QT_NO_COMBOBOX |