diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-19 15:00:45 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-19 15:00:45 (GMT) |
| commit | 10524a2d304010314fd48dd8131a600210de8a82 (patch) | |
| tree | 2b350d6b0ed7c70b4a228c129aa17396a90b6c18 | |
| parent | 129a44a9cea98c4e3d24a2b890c20ff154c87172 (diff) | |
| parent | fc9d3d2f476ff3a87fccffe3cfe2544547d2bdc3 (diff) | |
| download | Qt-10524a2d304010314fd48dd8131a600210de8a82.zip Qt-10524a2d304010314fd48dd8131a600210de8a82.tar.gz Qt-10524a2d304010314fd48dd8131a600210de8a82.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QGroupBox: Fix the focus rect of the title when using stylesheet
| -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 7351a7d..4be439d 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -3048,6 +3048,13 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC titleRule.configurePalette(&pal, QPalette::WindowText, QPalette::Window); drawItemText(p, labelRect, alignment, pal, gb->state & State_Enabled, gb->text, QPalette::WindowText); + + if (gb->state & State_HasFocus) { + QStyleOptionFocusRect fropt; + fropt.QStyleOption::operator=(*gb); + fropt.rect = labelRect; + drawPrimitive(PE_FrameFocusRect, &fropt, p, w); + } } return; |