Windows11Style: don't crop checkbox with no textHEADdev

The size calculation for a checkbox with no additional text/icon did not
match the drawing code.
There are still some values to settle but the logic is now correct even
the spacing might change in the future to match the WinUI3 style
spacings.

Pick-to: 6.10
Fixes: QTBUG-135628
Change-Id: I37e44fe8ad4f377ad346e55aac9854f4da6fc222
Reviewed-by: Wladimir Leuschner <[email protected]>

1 files changed, 29 insertions, 9 deletions

diff --git a/src/plugins/styles/modernwindows/qwindows11style.cpp b/src/plugins/styles/modernwindows/qwindows11style.cpp
index 8bea17594a0..c4a35115639 100644
--- a/src/plugins/styles/modernwindows/qwindows11style.cpp
+++ b/src/plugins/styles/modernwindows/qwindows11style.cpp
@@ -871,17 +871,13 @@ void QWindows11Style::drawPrimitive(PrimitiveElement element, const QStyleOption
         }
         break;
     case PE_IndicatorCheckBox: {
-            const bool isRtl = option->direction == Qt::RightToLeft;
             const bool isOn = option->state & State_On;
             const bool isPartial = option->state & State_NoChange;
 
-            QRectF rect = isRtl ? option->rect.adjusted(0, 0, -2, 0) : option->rect.adjusted(2, 0, 0, 0);
+            const QRectF rect = option->rect;
             const QPointF center = rect.center();
-            rect.setWidth(15);
-            rect.setHeight(15);
-            rect.moveCenter(center);
 
-            drawRoundedRect(painter, rect, borderPenControlAlt(option),
+            drawRoundedRect(painter, option->rect, borderPenControlAlt(option),
                             controlFillBrush(option, ControlType::ControlAlt));
 
             if (isOn) {
@@ -925,7 +921,6 @@ void QWindows11Style::drawPrimitive(PrimitiveElement element, const QStyleOption
         }
         break;
     case PE_IndicatorRadioButton: {
-            const bool isRtl = option->direction == Qt::RightToLeft;
             const bool isOn = option->state & State_On;
             qreal innerRadius = radioButtonInnerRadius(state);
             if (d->transitionsEnabled() && option->styleObject) {
@@ -936,7 +931,7 @@ void QWindows11Style::drawPrimitive(PrimitiveElement element, const QStyleOption
                 option->styleObject->setProperty("_q_inner_radius", innerRadius);
             }
 
-            QRectF rect = isRtl ? option->rect.adjusted(0, 0, -2, 0) : option->rect.adjusted(2, 0, 0, 0);
+            const QRectF rect = option->rect;
             const QPointF center = rect.center();
 
             painter->setPen(borderPenControlAlt(option));
@@ -1857,7 +1852,7 @@ QRect QWindows11Style::subElementRect(QStyle::SubElement element, const QStyleOp
     case QStyle::SE_RadioButtonIndicator:
     case QStyle::SE_CheckBoxIndicator:
         ret = QWindowsVistaStyle::subElementRect(element, option, widget);
-        ret = ret.marginsRemoved(QMargins(4,0,0,0));
+        ret.moveLeft(contentItemHMargin);
         break;
     case QStyle::SE_ComboBoxFocusRect:
     case QStyle::SE_CheckBoxFocusRect:
@@ -2167,6 +2162,27 @@ QSize QWindows11Style::sizeFromContents(ContentsType type, const QStyleOption *o
         break;
     case CT_RadioButton:
     case CT_CheckBox:
+        if (const auto *buttonOpt = qstyleoption_cast<const QStyleOptionButton *>(option)) {
+            const auto p = proxy();
+            const bool isRadio = (type == CT_RadioButton);
+
+            const int width = p->pixelMetric(
+                    isRadio ? PM_ExclusiveIndicatorWidth : PM_IndicatorWidth, option, widget);
+            const int height = p->pixelMetric(
+                    isRadio ? PM_ExclusiveIndicatorHeight : PM_IndicatorHeight, option, widget);
+
+            int margins = 2 * contentItemHMargin;
+            if (!buttonOpt->icon.isNull() || !buttonOpt->text.isEmpty()) {
+                margins += p->pixelMetric(isRadio ? PM_RadioButtonLabelSpacing
+                                                  : PM_CheckBoxLabelSpacing,
+                                          option, widget);
+            }
+
+            contentSize += QSize(width + margins, 4);
+            contentSize.setHeight(qMax(size.height(), height + 2 * contentItemHMargin));
+        }
+        break;
+
         // the indicator needs 2px more in width when there is no text, not needed when
         // the style draws the text
         contentSize = QWindowsVistaStyle::sizeFromContents(type, option, size, widget);
@@ -2218,6 +2234,10 @@ int QWindows11Style::pixelMetric(PixelMetric metric, const QStyleOption *option,
     case PM_SliderLength:           // same because handle is a circle with r=8
         res += 2 * 8;
         break;
+    case PM_RadioButtonLabelSpacing:
+    case PM_CheckBoxLabelSpacing:
+        res = 2 * contentItemHMargin;
+        break;
     case QStyle::PM_TitleBarButtonIconSize:
         res = 16;
         break;