From aceaa093f90fd006e5b2d9523b8ed6cab7b8577d Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@theqtcompany.com>
Date: Mon, 2 Mar 2015 18:42:28 +0100
Subject: Update src/imports to use top/left/right/bottomPadding

Change-Id: I9c72db2d8f44429a7c87baaad663b88c7e1f1bb9
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
---
 src/imports/controls/RadioButton.qml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/imports/controls/RadioButton.qml')

diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml
index 919ab947..82ecc10c 100644
--- a/src/imports/controls/RadioButton.qml
+++ b/src/imports/controls/RadioButton.qml
@@ -43,24 +43,27 @@ AbstractRadioButton {
     implicitWidth: Math.max(background ? background.implicitWidth : 0,
                             (label ? label.implicitWidth : 0) +
                             (indicator ? indicator.implicitWidth : 0) +
-                            (label && indicator ? style.spacing : 0) + padding.left + padding.right)
+                            (label && indicator ? style.spacing : 0) + leftPadding + rightPadding)
     implicitHeight: Math.max(background ? background.implicitHeight : 0,
                              Math.max(label ? label.implicitHeight : 0,
-                                      indicator ? indicator.implicitHeight : 0) + padding.top + padding.bottom)
+                                      indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
 
     Accessible.name: text
     Accessible.checked: checked
     Accessible.pressed: pressed
     Accessible.role: Accessible.RadioButton
 
-    padding { top: style.padding; left: style.padding; right: style.padding; bottom: style.padding }
+    topPadding: style.padding
+    leftPadding: style.padding
+    rightPadding: style.padding
+    bottomPadding: style.padding
 
     indicator: Rectangle {
         readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft
 
         implicitWidth: 20
         implicitHeight: 20
-        x: text ? (mirror ? parent.width - width - padding.right : padding.left) : (parent.width - width) / 2
+        x: text ? (mirror ? parent.width - width - control.rightPadding : control.leftPadding) : (parent.width - width) / 2
         y: (parent.height - height) / 2
 
         radius: width / 2
@@ -86,10 +89,10 @@ AbstractRadioButton {
     label: Text {
         readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft
 
-        x: mirror ? padding.left : (indicator.x + indicator.width + control.style.spacing)
-        y: padding.top
-        width: parent.width - indicator.width - control.style.spacing - padding.left - padding.right
-        height: parent.height - padding.top - padding.bottom
+        x: mirror ? control.leftPadding : (indicator.x + indicator.width + control.style.spacing)
+        y: control.topPadding
+        width: parent.width - indicator.width - control.style.spacing - control.leftPadding - control.rightPadding
+        height: parent.height - control.topPadding - control.bottomPadding
 
         text: control.text
         color: control.style.textColor
-- 
cgit v1.2.3