Use horizontal|verticalPadding

Change-Id: I564bf29a859f29d83c94c4428737c0846c1baadb
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

21 files changed, 22 insertions, 44 deletions

diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml
index 573dc0d6..a8d7edb9 100644
--- a/src/imports/controls/Button.qml
+++ b/src/imports/controls/Button.qml
@@ -49,8 +49,7 @@ T.Button {
     baselineOffset: contentItem.y + contentItem.baselineOffset
 
     padding: 6
-    leftPadding: padding + 2
-    rightPadding: padding + 2
+    horizontalPadding: padding + 2
     spacing: 6
 
     icon.width: 24
diff --git a/src/imports/controls/DelayButton.qml b/src/imports/controls/DelayButton.qml
index 7d3f258b..0aadb002 100644
--- a/src/imports/controls/DelayButton.qml
+++ b/src/imports/controls/DelayButton.qml
@@ -49,8 +49,7 @@ T.DelayButton {
     baselineOffset: contentItem.y + contentItem.baselineOffset
 
     padding: 6
-    leftPadding: padding + 2
-    rightPadding: padding + 2
+    horizontalPadding: padding + 2
 
     transition: Transition {
         NumberAnimation {
diff --git a/src/imports/controls/MenuSeparator.qml b/src/imports/controls/MenuSeparator.qml
index 31ffd1bf..0ec3bd34 100644
--- a/src/imports/controls/MenuSeparator.qml
+++ b/src/imports/controls/MenuSeparator.qml
@@ -46,8 +46,7 @@ T.MenuSeparator {
     implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding)
 
     padding: 2
-    topPadding: padding + 4
-    bottomPadding: padding + 4
+    verticalPadding: padding + 4
 
     contentItem: Rectangle {
         implicitWidth: 188
diff --git a/src/imports/controls/ToolSeparator.qml b/src/imports/controls/ToolSeparator.qml
index 00fe36da..72fdb4ca 100644
--- a/src/imports/controls/ToolSeparator.qml
+++ b/src/imports/controls/ToolSeparator.qml
@@ -46,8 +46,7 @@ T.ToolSeparator {
     implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding)
 
     padding: vertical ? 6 : 2
-    topPadding: vertical ? 2 : 6
-    bottomPadding: vertical ? 2 : 6
+    verticalPadding: vertical ? 2 : 6
 
     contentItem: Rectangle {
         implicitWidth: vertical ? 1 : 30
diff --git a/src/imports/controls/fusion/MenuSeparator.qml b/src/imports/controls/fusion/MenuSeparator.qml
index 030866d7..c677ec9f 100644
--- a/src/imports/controls/fusion/MenuSeparator.qml
+++ b/src/imports/controls/fusion/MenuSeparator.qml
@@ -48,8 +48,7 @@ T.MenuSeparator {
     implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding)
 
     padding: 5
-    topPadding: 1
-    bottomPadding: 1
+    verticalPadding: 1
 
     contentItem: Rectangle {
         implicitWidth: 188
diff --git a/src/imports/controls/fusion/ToolSeparator.qml b/src/imports/controls/fusion/ToolSeparator.qml
index 85709eab..c1127b88 100644
--- a/src/imports/controls/fusion/ToolSeparator.qml
+++ b/src/imports/controls/fusion/ToolSeparator.qml
@@ -48,8 +48,7 @@ T.ToolSeparator {
     implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding)
 
     padding: vertical ? 6 : 2
-    topPadding: vertical ? 2 : 6
-    bottomPadding: vertical ? 2 : 6
+    verticalPadding: vertical ? 2 : 6
 
     contentItem: Rectangle {
         implicitWidth: vertical ? 2 : 8
diff --git a/src/imports/controls/material/CheckBox.qml b/src/imports/controls/material/CheckBox.qml
index 9e6e3b40..168e9a70 100644
--- a/src/imports/controls/material/CheckBox.qml
+++ b/src/imports/controls/material/CheckBox.qml
@@ -51,8 +51,7 @@ T.CheckBox {
 
     spacing: 8
     padding: 8
-    topPadding: padding + 7
-    bottomPadding: padding + 7
+    verticalPadding: padding + 7
 
     indicator: CheckIndicator {
         x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2
diff --git a/src/imports/controls/material/DialogButtonBox.qml b/src/imports/controls/material/DialogButtonBox.qml
index c3bea49f..80948ac5 100644
--- a/src/imports/controls/material/DialogButtonBox.qml
+++ b/src/imports/controls/material/DialogButtonBox.qml
@@ -51,8 +51,7 @@ T.DialogButtonBox {
 
     spacing: 8
     padding: 8
-    topPadding: 2
-    bottomPadding: 2
+    verticalPadding: 2
     alignment: Qt.AlignRight
     buttonLayout: DialogButtonBox.AndroidLayout
 
diff --git a/src/imports/controls/material/Frame.qml b/src/imports/controls/material/Frame.qml
index 16bc6d3b..36661792 100644
--- a/src/imports/controls/material/Frame.qml
+++ b/src/imports/controls/material/Frame.qml
@@ -49,8 +49,7 @@ T.Frame {
     contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0)
 
     padding: 12
-    topPadding: Material.frameVerticalPadding
-    bottomPadding: Material.frameVerticalPadding
+    verticalPadding: Material.frameVerticalPadding
 
     background: Rectangle {
         radius: 2
diff --git a/src/imports/controls/material/Menu.qml b/src/imports/controls/material/Menu.qml
index 7d8d6538..3ce21d91 100644
--- a/src/imports/controls/material/Menu.qml
+++ b/src/imports/controls/material/Menu.qml
@@ -51,8 +51,7 @@ T.Menu {
                              contentItem ? contentItem.implicitHeight : 0) + topPadding + bottomPadding
 
     margins: 0
-    topPadding: 8
-    bottomPadding: 8
+    verticalPadding: 8
 
     transformOrigin: !cascade ? Item.Top : (mirrored ? Item.TopRight : Item.TopLeft)
 
diff --git a/src/imports/controls/material/MenuBarItem.qml b/src/imports/controls/material/MenuBarItem.qml
index 2ca54a18..0b03d954 100644
--- a/src/imports/controls/material/MenuBarItem.qml
+++ b/src/imports/controls/material/MenuBarItem.qml
@@ -51,8 +51,7 @@ T.MenuBarItem {
     baselineOffset: contentItem.y + contentItem.baselineOffset
 
     padding: 16
-    topPadding: 12
-    bottomPadding: 12
+    verticalPadding: 12
     spacing: 16
 
     icon.width: 24
diff --git a/src/imports/controls/material/MenuItem.qml b/src/imports/controls/material/MenuItem.qml
index f37a755e..0323be9a 100644
--- a/src/imports/controls/material/MenuItem.qml
+++ b/src/imports/controls/material/MenuItem.qml
@@ -52,8 +52,7 @@ T.MenuItem {
     baselineOffset: contentItem.y + contentItem.baselineOffset
 
     padding: 16
-    topPadding: Material.menuItemVerticalPadding
-    bottomPadding: Material.menuItemVerticalPadding
+    verticalPadding: Material.menuItemVerticalPadding
     spacing: 16
 
     icon.width: 24
diff --git a/src/imports/controls/material/MenuSeparator.qml b/src/imports/controls/material/MenuSeparator.qml
index 86f53fa8..330d7c06 100644
--- a/src/imports/controls/material/MenuSeparator.qml
+++ b/src/imports/controls/material/MenuSeparator.qml
@@ -44,8 +44,7 @@ T.MenuSeparator {
     implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem.implicitWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding)
 
-    topPadding: 8
-    bottomPadding: 8
+    verticalPadding: 8
 
     contentItem: Rectangle {
         implicitWidth: 200
diff --git a/src/imports/controls/material/RadioButton.qml b/src/imports/controls/material/RadioButton.qml
index b5e638b9..2bd6b0be 100644
--- a/src/imports/controls/material/RadioButton.qml
+++ b/src/imports/controls/material/RadioButton.qml
@@ -51,8 +51,7 @@ T.RadioButton {
 
     spacing: 8
     padding: 8
-    topPadding: padding + 6
-    bottomPadding: padding + 6
+    verticalPadding: padding + 6
 
     indicator: RadioIndicator {
         x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2
diff --git a/src/imports/controls/material/RadioDelegate.qml b/src/imports/controls/material/RadioDelegate.qml
index e528a314..5fe25049 100644
--- a/src/imports/controls/material/RadioDelegate.qml
+++ b/src/imports/controls/material/RadioDelegate.qml
@@ -52,8 +52,7 @@ T.RadioDelegate {
     baselineOffset: contentItem.y + contentItem.baselineOffset
 
     padding: 16
-    topPadding: 8
-    bottomPadding: 8
+    verticalPadding: 8
     spacing: 16
 
     icon.width: 24
diff --git a/src/imports/controls/material/SwipeDelegate.qml b/src/imports/controls/material/SwipeDelegate.qml
index 3679759d..60e4b19b 100644
--- a/src/imports/controls/material/SwipeDelegate.qml
+++ b/src/imports/controls/material/SwipeDelegate.qml
@@ -52,8 +52,7 @@ T.SwipeDelegate {
     baselineOffset: contentItem.y + contentItem.baselineOffset
 
     padding: 16
-    topPadding: 8
-    bottomPadding: 8
+    verticalPadding: 8
     spacing: 16
 
     icon.width: 24
diff --git a/src/imports/controls/material/SwitchDelegate.qml b/src/imports/controls/material/SwitchDelegate.qml
index 00656ce8..3e955776 100644
--- a/src/imports/controls/material/SwitchDelegate.qml
+++ b/src/imports/controls/material/SwitchDelegate.qml
@@ -52,8 +52,7 @@ T.SwitchDelegate {
     baselineOffset: contentItem.y + contentItem.baselineOffset
 
     padding: 16
-    topPadding: Material.switchDelegateVerticalPadding
-    bottomPadding: Material.switchDelegateVerticalPadding
+    verticalPadding: Material.switchDelegateVerticalPadding
     spacing: 16
 
     icon.width: 24
diff --git a/src/imports/controls/material/ToolSeparator.qml b/src/imports/controls/material/ToolSeparator.qml
index 2f07ad7b..001d4da9 100644
--- a/src/imports/controls/material/ToolSeparator.qml
+++ b/src/imports/controls/material/ToolSeparator.qml
@@ -44,10 +44,8 @@ T.ToolSeparator {
     implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem.implicitWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding)
 
-    leftPadding: vertical ? 12 : 5
-    rightPadding: vertical ? 12 : 5
-    topPadding: vertical ? 5 : 12
-    bottomPadding: vertical ? 5 : 12
+    horizontalPadding: vertical ? 12 : 5
+    verticalPadding: vertical ? 5 : 12
 
     contentItem: Rectangle {
         implicitWidth: vertical ? 1 : 38
diff --git a/src/imports/controls/universal/Button.qml b/src/imports/controls/universal/Button.qml
index 4c2c8555..1c9af030 100644
--- a/src/imports/controls/universal/Button.qml
+++ b/src/imports/controls/universal/Button.qml
@@ -50,8 +50,7 @@ T.Button {
     baselineOffset: contentItem.y + contentItem.baselineOffset
 
     padding: 8
-    topPadding: padding - 4
-    bottomPadding: padding - 4
+    verticalPadding: padding - 4
     spacing: 8
 
     icon.width: 20
diff --git a/src/imports/controls/universal/DelayButton.qml b/src/imports/controls/universal/DelayButton.qml
index 66690041..dca13e10 100644
--- a/src/imports/controls/universal/DelayButton.qml
+++ b/src/imports/controls/universal/DelayButton.qml
@@ -48,8 +48,7 @@ T.DelayButton {
     baselineOffset: contentItem.y + contentItem.baselineOffset
 
     padding: 8
-    topPadding: padding - 4
-    bottomPadding: padding - 4
+    verticalPadding: padding - 4
 
     property bool useSystemFocusVisuals: true
 
diff --git a/src/imports/controls/universal/Dialog.qml b/src/imports/controls/universal/Dialog.qml
index a640aa17..a380a844 100644
--- a/src/imports/controls/universal/Dialog.qml
+++ b/src/imports/controls/universal/Dialog.qml
@@ -55,8 +55,7 @@ T.Dialog {
     contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0)
 
     padding: 24
-    topPadding: 18
-    bottomPadding: 18
+    verticalPadding: 18
 
     background: Rectangle {
         color: control.Universal.chromeMediumLowColor