Fix QSpinBox size calculation problem with empty stylesheets
Task-number: QTBUG-34305 Change-Id: I3e89dc66446e9f5e9e1810be367830b9df98ab0b Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
This commit is contained in:
parent
ebf0524186
commit
195cd51f7d
@ -4821,7 +4821,7 @@ QSize QStyleSheetStyle::sizeFromContents(ContentsType ct, const QStyleOption *op
|
|||||||
QSize defaultUpSize = defaultSize(w, subRule.size(), spinbox->rect, PseudoElement_SpinBoxUpButton);
|
QSize defaultUpSize = defaultSize(w, subRule.size(), spinbox->rect, PseudoElement_SpinBoxUpButton);
|
||||||
sz += QSize(defaultUpSize.width(), 0);
|
sz += QSize(defaultUpSize.width(), 0);
|
||||||
}
|
}
|
||||||
if (rule.hasBox() || !rule.hasNativeBorder())
|
if (rule.hasBox() || rule.hasBorder() || !rule.hasNativeBorder())
|
||||||
sz = rule.boxSize(sz);
|
sz = rule.boxSize(sz);
|
||||||
return sz;
|
return sz;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user