summaryrefslogtreecommitdiffstats
path: root/src/gui/styles/qstylesheetstyle.cpp
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2010-02-22 12:39:40 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2010-02-22 12:47:08 (GMT)
commit93ba9e3bc2bb4879d6b35b98d7d16c19f7c8221f (patch)
treeaed44165c6ddfc28f7f0078f1a8e314de2ea463a /src/gui/styles/qstylesheetstyle.cpp
parentbab18de3932a802568d6d9e0cea9e76f02e6bf5d (diff)
downloadQt-93ba9e3bc2bb4879d6b35b98d7d16c19f7c8221f.zip
Qt-93ba9e3bc2bb4879d6b35b98d7d16c19f7c8221f.tar.gz
Qt-93ba9e3bc2bb4879d6b35b98d7d16c19f7c8221f.tar.bz2
Stylesheet: Fix size specified in QToolbar::handle
Regression since f0243e70e05a3368582fd0478d840096d6b60c3f We added a new rule (SE_ToolBarHandle) and the baseStyle was calling pixelMetric(PM_ToolBarHandleExtent) on itself, bypassing the QStyleSheetStyle Reviewed-by: Thierry Task-number: QTBUG-8348
Diffstat (limited to 'src/gui/styles/qstylesheetstyle.cpp')
-rw-r--r--src/gui/styles/qstylesheetstyle.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp
index b36294a..c550938 100644
--- a/src/gui/styles/qstylesheetstyle.cpp
+++ b/src/gui/styles/qstylesheetstyle.cpp
@@ -5743,6 +5743,13 @@ QRect QStyleSheetStyle::subElementRect(SubElement se, const QStyleOption *opt, c
return positionRect(w, subRule, subRule2, pe, opt->rect, opt->direction);
}
+#ifndef QT_NO_TOOLBAR
+ case SE_ToolBarHandle:
+ if (hasStyleRule(w, PseudoElement_ToolBarHandle))
+ return ParentStyle::subElementRect(se, opt, w);
+ break;
+#endif //QT_NO_TOOLBAR
+
default:
break;
}