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/GroupBox.qml | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

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

diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml
index 39e45adb..2e278e3a 100644
--- a/src/imports/controls/GroupBox.qml
+++ b/src/imports/controls/GroupBox.qml
@@ -43,31 +43,29 @@ AbstractGroupBox {
     default property alias data: content.data
 
     implicitWidth: Math.max(background ? background.implicitWidth : 0,
-                            contentWidth + padding.left + padding.right)
+                            contentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(background ? background.implicitHeight : 0,
-                             contentHeight + padding.top + padding.bottom)
+                             contentHeight + topPadding + bottomPadding)
 
     contentWidth: content.children.length === 1 ? content.children[0].implicitWidth : 0
     contentHeight: content.children.length === 1 ? content.children[0].implicitHeight : 0
 
-    padding {
-        top: style.padding + (label && title ? label.implicitHeight + style.spacing : 0)
-        left: style.padding
-        right: style.padding
-        bottom: style.padding
-    }
+    topPadding: style.padding + (label && title ? label.implicitHeight + style.spacing : 0)
+    leftPadding: style.padding
+    rightPadding: style.padding
+    bottomPadding: style.padding
 
     contentItem: Item {
         id: content
-        x: padding.left
-        y: padding.top
-        width: parent.width - padding.left - padding.right
-        height: parent.height - padding.top - padding.bottom
+        x: control.leftPadding
+        y: control.topPadding
+        width: parent.width - control.leftPadding - control.rightPadding
+        height: parent.height - control.topPadding - control.bottomPadding
     }
 
     label: Text {
-        x: padding.left
-        width: parent.width - padding.left - padding.right
+        x: control.leftPadding
+        width: parent.width - control.leftPadding - control.rightPadding
 
         text: control.title
         color: control.style.textColor
@@ -78,9 +76,9 @@ AbstractGroupBox {
     }
 
     frame: Rectangle {
-        y: padding.top - style.padding
+        y: control.topPadding - style.padding
         width: parent.width
-        height: parent.height - padding.top + style.padding
+        height: parent.height - control.topPadding + style.padding
 
         color: "transparent"
         radius: style.roundness
-- 
cgit v1.2.3