GroupBox: fix background y and height assignments

Use the more specific bottomPadding rather than padding.

Change-Id: Ib8823d6d9b07eaea97479ef432df0868b1b5d37d
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

6 files changed, 11 insertions, 11 deletions

diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml
index a594869b..2985c02e 100644
--- a/src/imports/controls/GroupBox.qml
+++ b/src/imports/controls/GroupBox.qml
@@ -66,9 +66,9 @@ T.GroupBox {
     }
 
     background: Rectangle {
-        y: control.topPadding - control.padding
+        y: control.topPadding - control.bottomPadding
         width: parent.width
-        height: parent.height - control.topPadding + control.padding
+        height: parent.height - control.topPadding + control.bottomPadding
 
         color: "transparent"
         border.color: control.palette.mid
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml
index cdab3e62..afefd3d8 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml
@@ -34,9 +34,9 @@ GroupBox {
     title: qsTr("GroupBox")
 
     background: Rectangle {
-        y: control.topPadding - control.padding
+        y: control.topPadding - control.bottomPadding
         width: parent.width
-        height: parent.height - control.topPadding + control.padding
+        height: parent.height - control.topPadding + control.bottomPadding
         color: "transparent"
         border.color: "#21be2b"
         radius: 2
diff --git a/src/imports/controls/fusion/GroupBox.qml b/src/imports/controls/fusion/GroupBox.qml
index a98cc9a8..439783ac 100644
--- a/src/imports/controls/fusion/GroupBox.qml
+++ b/src/imports/controls/fusion/GroupBox.qml
@@ -68,9 +68,9 @@ T.GroupBox {
     }
 
     background: Rectangle {
-        y: control.topPadding - control.padding
+        y: control.topPadding - control.bottomPadding
         width: parent.width
-        height: parent.height - control.topPadding + control.padding
+        height: parent.height - control.topPadding + control.bottomPadding
 
         radius: 2
         color: Color.transparent("black", 3 / 255)
diff --git a/src/imports/controls/imagine/GroupBox.qml b/src/imports/controls/imagine/GroupBox.qml
index f262fb5f..b2868cec 100644
--- a/src/imports/controls/imagine/GroupBox.qml
+++ b/src/imports/controls/imagine/GroupBox.qml
@@ -88,7 +88,7 @@ T.GroupBox {
 
     background: NinePatchImage {
         x: -leftInset
-        y: control.topPadding - control.padding - topInset
+        y: control.topPadding - control.bottomPadding - topInset
         width: control.width + leftInset + rightInset
         height: control.height + topInset + bottomInset - control.topPadding + control.padding
 
diff --git a/src/imports/controls/material/GroupBox.qml b/src/imports/controls/material/GroupBox.qml
index cc2ab0f0..7ac30ec6 100644
--- a/src/imports/controls/material/GroupBox.qml
+++ b/src/imports/controls/material/GroupBox.qml
@@ -66,9 +66,9 @@ T.GroupBox {
     }
 
     background: Rectangle {
-        y: control.topPadding - control.padding
+        y: control.topPadding - control.bottomPadding
         width: parent.width
-        height: parent.height - control.topPadding + control.padding
+        height: parent.height - control.topPadding + control.bottomPadding
 
         radius: 2
         color: control.Material.elevation > 0 ? control.Material.backgroundColor : "transparent"
diff --git a/src/imports/controls/universal/GroupBox.qml b/src/imports/controls/universal/GroupBox.qml
index f6b0b271..8fb68e29 100644
--- a/src/imports/controls/universal/GroupBox.qml
+++ b/src/imports/controls/universal/GroupBox.qml
@@ -67,9 +67,9 @@ T.GroupBox {
     }
 
     background: Rectangle {
-        y: control.topPadding - control.padding
+        y: control.topPadding - control.bottomPadding
         width: parent.width
-        height: parent.height - control.topPadding + control.padding
+        height: parent.height - control.topPadding + control.bottomPadding
 
         color: "transparent"
         border.color: control.Universal.chromeDisabledLowColor