summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-08-05 11:53:44 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-08-05 11:58:51 (GMT)
commite80dc7d3a8ab098627c9c81ea390de7db0ec264e (patch)
tree3dc590cbd98cd748b3b82a27ff2f214cacb1019f /src
parentca2a9d87d81095f6ff7b821e3d8cbe120a6d9b23 (diff)
downloadQt-e80dc7d3a8ab098627c9c81ea390de7db0ec264e.zip
Qt-e80dc7d3a8ab098627c9c81ea390de7db0ec264e.tar.gz
Qt-e80dc7d3a8ab098627c9c81ea390de7db0ec264e.tar.bz2
Fixed setting a style shet on a QSpinBox to change the arrow possition
If you only set the position, of the button without setting a geometry, it did not work. Task-number: 259226
Diffstat (limited to 'src')
-rw-r--r--src/gui/styles/qstylesheetstyle.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp
index 2efa4a7..5f6d4ab 100644
--- a/src/gui/styles/qstylesheetstyle.cpp
+++ b/src/gui/styles/qstylesheetstyle.cpp
@@ -2891,8 +2891,8 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC
bool customUp = true, customDown = true;
QRenderRule upRule = renderRule(w, opt, PseudoElement_SpinBoxUpButton);
QRenderRule downRule = renderRule(w, opt, PseudoElement_SpinBoxDownButton);
- bool upRuleMatch = upRule.hasGeometry();
- bool downRuleMatch = downRule.hasGeometry();
+ bool upRuleMatch = upRule.hasGeometry() || upRule.hasPosition();
+ bool downRuleMatch = downRule.hasGeometry() || downRule.hasPosition();
if (rule.hasNativeBorder() && !upRuleMatch && !downRuleMatch) {
rule.drawBackgroundImage(p, spinOpt.rect);
customUp = (opt->subControls & QStyle::SC_SpinBoxUp)
@@ -5167,8 +5167,8 @@ QRect QStyleSheetStyle::subControlRect(ComplexControl cc, const QStyleOptionComp
QRenderRule upRule = renderRule(w, opt, PseudoElement_SpinBoxUpButton);
QRenderRule downRule = renderRule(w, opt, PseudoElement_SpinBoxDownButton);
bool ruleMatch = rule.hasBox() || !rule.hasNativeBorder();
- bool upRuleMatch = upRule.hasGeometry();
- bool downRuleMatch = downRule.hasGeometry();
+ bool upRuleMatch = upRule.hasGeometry() || upRule.hasPosition();
+ bool downRuleMatch = downRule.hasGeometry() || upRule.hasPosition();
if (ruleMatch || upRuleMatch || downRuleMatch) {
switch (sc) {
case SC_SpinBoxFrame: