From cfd80c5b44ac82ea6246f0a148e8515749c2b0a2 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 28 Feb 2018 19:44:25 +0100 Subject: Use horizontal|verticalPadding A follow-up commit to 13d56b5. Somehow these were missed. Change-Id: Ief9831797cdda81dd3430b0df0aed2a6050093ca Reviewed-by: Mitch Curtis --- src/imports/controls/fusion/TabButton.qml | 3 +-- src/imports/controls/fusion/ToolBar.qml | 3 +-- src/imports/controls/material/Button.qml | 3 +-- src/imports/controls/material/CheckDelegate.qml | 3 +-- src/imports/controls/material/DelayButton.qml | 3 +-- src/imports/controls/material/ItemDelegate.qml | 3 +-- src/imports/controls/material/ToolTip.qml | 3 +-- 7 files changed, 7 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/imports/controls/fusion/TabButton.qml b/src/imports/controls/fusion/TabButton.qml index 89743181..81500f8c 100644 --- a/src/imports/controls/fusion/TabButton.qml +++ b/src/imports/controls/fusion/TabButton.qml @@ -51,8 +51,7 @@ T.TabButton { baselineOffset: contentItem.y + contentItem.baselineOffset padding: 2 - leftPadding: 4 - rightPadding: 4 + horizontalPadding: 4 spacing: 6 icon.width: 16 diff --git a/src/imports/controls/fusion/ToolBar.qml b/src/imports/controls/fusion/ToolBar.qml index b5fdf85b..9acd837c 100644 --- a/src/imports/controls/fusion/ToolBar.qml +++ b/src/imports/controls/fusion/ToolBar.qml @@ -50,8 +50,7 @@ T.ToolBar { contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) - leftPadding: 6 - rightPadding: 6 + horizontalPadding: 6 topPadding: control.position === T.ToolBar.Footer ? 1 : 0 bottomPadding: control.position === T.ToolBar.Header ? 1 : 0 diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml index 645977cb..ccd67567 100644 --- a/src/imports/controls/material/Button.qml +++ b/src/imports/controls/material/Button.qml @@ -52,8 +52,7 @@ T.Button { // external vertical padding is 6 (to increase touch area) padding: 12 - leftPadding: padding - 4 - rightPadding: padding - 4 + horizontalPadding: padding - 4 spacing: 6 icon.width: 24 diff --git a/src/imports/controls/material/CheckDelegate.qml b/src/imports/controls/material/CheckDelegate.qml index b07364d0..dafff2c2 100644 --- a/src/imports/controls/material/CheckDelegate.qml +++ b/src/imports/controls/material/CheckDelegate.qml @@ -52,8 +52,7 @@ T.CheckDelegate { 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/DelayButton.qml b/src/imports/controls/material/DelayButton.qml index 160cfe07..f2dabea4 100644 --- a/src/imports/controls/material/DelayButton.qml +++ b/src/imports/controls/material/DelayButton.qml @@ -52,8 +52,7 @@ T.DelayButton { // external vertical padding is 6 (to increase touch area) padding: 12 - leftPadding: padding - 4 - rightPadding: padding - 4 + verticalPadding: padding - 4 Material.elevation: control.down ? 8 : 2 diff --git a/src/imports/controls/material/ItemDelegate.qml b/src/imports/controls/material/ItemDelegate.qml index f0ef11a3..dbd162d0 100644 --- a/src/imports/controls/material/ItemDelegate.qml +++ b/src/imports/controls/material/ItemDelegate.qml @@ -52,8 +52,7 @@ T.ItemDelegate { 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/ToolTip.qml b/src/imports/controls/material/ToolTip.qml index 1f786a3f..7cde410c 100644 --- a/src/imports/controls/material/ToolTip.qml +++ b/src/imports/controls/material/ToolTip.qml @@ -51,8 +51,7 @@ T.ToolTip { margins: 12 padding: 8 - leftPadding: padding + 8 - rightPadding: padding + 8 + horizontalPadding: padding + 8 closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnReleaseOutsideParent -- cgit v1.2.3