diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-04 11:52:02 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-04 11:52:02 (GMT) |
| commit | 6a89d8fa5ee84188a8921dc387f82593cfed166b (patch) | |
| tree | 25cb4322dde8eac606c3ba14239e7ec25876815f | |
| parent | 202dee4e4840ef899edcb638fabc28b281e7a2dd (diff) | |
| parent | e1a81c96790bee72ee4fbd2b0c4a7b48078c4ec1 (diff) | |
| download | Qt-6a89d8fa5ee84188a8921dc387f82593cfed166b.zip Qt-6a89d8fa5ee84188a8921dc387f82593cfed166b.tar.gz Qt-6a89d8fa5ee84188a8921dc387f82593cfed166b.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt-widget-team into 4.6
| -rw-r--r-- | src/gui/styles/qstylesheetstyle.cpp | 2 | ||||
| -rw-r--r-- | src/gui/styles/qwindowsstyle.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp index dfe5209..e61658b 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -3675,7 +3675,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q } if (!cb->currentText.isEmpty() && !cb->editable) { drawItemText(p, editRect.adjusted(0, 0, 0, 0), Qt::AlignLeft | Qt::AlignVCenter, cb->palette, - cb->state & State_Enabled, cb->currentText); + cb->state & State_Enabled, cb->currentText, QPalette::Text); } p->restore(); return; diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/gui/styles/qwindowsstyle.cpp index 5cf738e..abce4d2 100644 --- a/src/gui/styles/qwindowsstyle.cpp +++ b/src/gui/styles/qwindowsstyle.cpp @@ -2994,6 +2994,7 @@ 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) { @@ -3063,6 +3064,7 @@ void QWindowsStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComp proxy()->drawPrimitive(PE_FrameFocusRect, &focus, p, widget); } } + p->restore(); } break; #endif // QT_NO_COMBOBOX |