QSpinBox still reserves space for buttons even when told to not show any buttons via QAbstractSpinBox::NoButtons (revival of QTBUG-1395)

NOTE: This bug is being reported against Qt release 5.2.1, although for some reason that release now appears to be missing from the "Affects Version/s" field, so I was forced to pick the nearest match, which is "5.2.0".

QTBUG-1395 still repros in 5.2.1, and it's impacting our product. I don't see any way to reactivate QTBUG-1395, so I'm creating this bug instead.

I have crafted a fix which appears to resolve this issue on both Windows and Mac on our end.

Perforce diff of the proposed fix:

==== //depot/third-party/qt/5.2/local/qtbase/src/widgets/styles/qcommonstyle.cpp#1 (text) ====

@@ -4820,7 +4820,7 @@
case CT_SpinBox:
if (const QStyleOptionSpinBox *vopt = qstyleoption_cast<const QStyleOptionSpinBox *>(opt))

{ // Add button + frame widths - int buttonWidth = 20; + int buttonWidth = subControlRect(CC_SpinBox, vopt, SC_SpinBoxUp, widget).width(); int fw = vopt->frame ? proxy()->pixelMetric(PM_SpinBoxFrameWidth, vopt, widget) : 0; sz += QSize(buttonWidth + 2*fw, 2*fw); }

==== //depot/third-party/qt/5.2/local/qtbase/src/widgets/styles/qmacstyle_mac.mm#3 (text) ====

@@ -6085,7 +6085,7 @@
case CT_SpinBox:
if (const QStyleOptionSpinBox *vopt = qstyleoption_cast<const QStyleOptionSpinBox *>(opt))

{ // Add button + frame widths - int buttonWidth = 20; + int buttonWidth = subControlRect(CC_SpinBox, vopt, SC_SpinBoxUp, widget).width(); int fw = proxy()->pixelMetric(PM_SpinBoxFrameWidth, vopt, widget); sz += QSize(buttonWidth + 2*fw, 2*fw - 3); }

==== //depot/third-party/qt/5.2/local/qtbase/src/widgets/styles/qstylesheetstyle.cpp#2 (text) ====

@@ -4811,15 +4811,18 @@
switch (ct) {
case CT_SpinBox: // ### hopelessly broken QAbstractSpinBox (part 1)
if (const QStyleOptionSpinBox *spinbox = qstyleoption_cast<const QStyleOptionSpinBox *>(opt)) {

• // Add some space for the up/down buttons
• QRenderRule subRule = renderRule(w, opt, PseudoElement_SpinBoxUpButton);
• if (subRule.hasDrawable()) { - QRect r = positionRect(w, rule, subRule, PseudoElement_SpinBoxUpButton, - opt->rect, opt->direction); - sz += QSize(r.width(), 0); - }

  else {

• QSize defaultUpSize = defaultSize(w, subRule.size(), spinbox->rect, PseudoElement_SpinBoxUpButton);
• sz += QSize(defaultUpSize.width(), 0);
  + if (spinbox->buttonSymbols != QAbstractSpinBox::NoButtons)
  +
  Unknown macro: {+ // Add some space for the up/down buttons+ QRenderRule subRule = renderRule(w, opt, PseudoElement_SpinBoxUpButton);+ if (subRule.hasDrawable()) { + QRect r = positionRect(w, rule, subRule, PseudoElement_SpinBoxUpButton, + opt->rect, opt->direction); + sz += QSize(r.width(), 0); + } else { + QSize defaultUpSize = defaultSize(w, subRule.size(), spinbox->rect, PseudoElement_SpinBoxUpButton); + sz += QSize(defaultUpSize.width(), 0); + } }

  if (rule.hasBox() || rule.hasBorder() || !rule.hasNativeBorder())
  sz = rule.boxSize(sz);