Controls: update all paddings to relative value with padding

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

4 files changed, 11 insertions, 14 deletions

diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml
index 7eb28282..a7d99106 100644
--- a/src/imports/controls/material/Button.qml
+++ b/src/imports/controls/material/Button.qml
@@ -50,8 +50,8 @@ T.Button {
 
     // external vertical padding is 6 (to increase touch area)
     padding: 12
-    leftPadding: 8
-    rightPadding: 8
+    leftPadding: padding - 4
+    rightPadding: padding - 4
 
     Material.elevation: flat ? control.down || control.hovered ? 2 : 0
                              : control.down ? 8 : 2
diff --git a/src/imports/controls/material/CheckBox.qml b/src/imports/controls/material/CheckBox.qml
index d2e58347..0163e37d 100644
--- a/src/imports/controls/material/CheckBox.qml
+++ b/src/imports/controls/material/CheckBox.qml
@@ -50,10 +50,9 @@ T.CheckBox {
     baselineOffset: contentItem.y + contentItem.baselineOffset
 
     spacing: 8
-    topPadding: 15
-    leftPadding: 8
-    rightPadding: 8
-    bottomPadding: 15
+    padding: 8
+    topPadding: padding + 7
+    bottomPadding: padding + 7
 
     //! [indicator]
     indicator: CheckIndicator {
diff --git a/src/imports/controls/material/RadioButton.qml b/src/imports/controls/material/RadioButton.qml
index 02687315..ddf496ab 100644
--- a/src/imports/controls/material/RadioButton.qml
+++ b/src/imports/controls/material/RadioButton.qml
@@ -50,10 +50,9 @@ T.RadioButton {
     baselineOffset: contentItem.y + contentItem.baselineOffset
 
     spacing: 8
-    topPadding: 14
-    leftPadding: 8
-    rightPadding: 8
-    bottomPadding: 14
+    padding: 8
+    topPadding: padding + 6
+    bottomPadding: padding + 6
 
     //! [indicator]
     indicator: RadioIndicator {
diff --git a/src/imports/controls/material/ToolTip.qml b/src/imports/controls/material/ToolTip.qml
index 0674c7d9..5b1b9667 100644
--- a/src/imports/controls/material/ToolTip.qml
+++ b/src/imports/controls/material/ToolTip.qml
@@ -50,10 +50,9 @@ T.ToolTip {
                              contentItem.implicitHeight + topPadding + bottomPadding)
 
     margins: 12
-    topPadding: 8
-    leftPadding: 16
-    rightPadding: 16
-    bottomPadding: 8
+    padding: 8
+    leftPadding: padding + 8
+    rightPadding: padding + 8
 
     closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnReleaseOutsideParent