CheckBox/RadioButton: attempt for better sizing

FedoraQt · Nov 12, 2020 · e0508ac · e0508ac
1 parent 4382b30
commit e0508ac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/theme/qml/CheckBox.qml b/theme/qml/CheckBox.qml
@@ -34,15 +34,15 @@ T.CheckBox {
     hoverEnabled: true
 
     indicator: CheckIndicator {
-        // x: control.text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2
+        x: control.text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2
         y: control.topPadding + (control.availableHeight - height) / 2
         control: control
     }
 
     contentItem: Label {
         id: label
-        leftPadding: control.indicator && !control.mirrored ? control.indicator.width : 0
-        rightPadding: control.indicator && control.mirrored ? control.indicator.width : 0
+        leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0
+        rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0
         text: control.text
         font: control.font
         color: control.enabled ? theme.textColor : theme.disabledTextColor

diff --git a/theme/qml/RadioButton.qml b/theme/qml/RadioButton.qml
@@ -34,15 +34,15 @@ T.CheckBox {
     hoverEnabled: true
 
     indicator: RadioIndicator {
-        // x: control.text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2
+        x: control.text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2
         y: control.topPadding + (control.availableHeight - height) / 2
         control: control
     }
 
     contentItem: Label {
         id: label
-        leftPadding: control.indicator && !control.mirrored ? control.indicator.width : 0
-        rightPadding: control.indicator && control.mirrored ? control.indicator.width : 0
+        leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0
+        rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0
         text: control.text
         font: control.font
         color: control.enabled ? theme.textColor : theme.disabledTextColor