From 9b33422f5167f8f7c31346f129adcc944266f372 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 6 May 2016 12:09:28 +0200 Subject: Controls: update all paddings to relative value with padding Change-Id: I7bf3a7fb9ca97e5c7ddf34f8f921d5d4be733861 Reviewed-by: J-P Nurmi --- src/imports/controls/Button.qml | 4 ++-- src/imports/controls/ComboBox.qml | 4 ++-- src/imports/controls/SpinBox.qml | 4 ++-- src/imports/controls/TextArea.qml | 2 +- src/imports/controls/TextField.qml | 2 +- src/imports/controls/material/Button.qml | 4 ++-- src/imports/controls/material/CheckBox.qml | 7 +++---- src/imports/controls/material/RadioButton.qml | 7 +++---- src/imports/controls/material/ToolTip.qml | 7 +++---- src/imports/controls/universal/Button.qml | 7 +++---- src/imports/controls/universal/CheckDelegate.qml | 7 +++---- src/imports/controls/universal/ComboBox.qml | 8 ++++---- src/imports/controls/universal/ItemDelegate.qml | 7 +++---- src/imports/controls/universal/MenuItem.qml | 7 +++---- src/imports/controls/universal/RadioDelegate.qml | 7 +++---- src/imports/controls/universal/SpinBox.qml | 9 +++++---- src/imports/controls/universal/SwipeDelegate.qml | 7 +++---- src/imports/controls/universal/SwitchDelegate.qml | 7 +++---- src/imports/controls/universal/TextArea.qml | 8 ++++---- src/imports/controls/universal/TextField.qml | 8 ++++---- src/imports/controls/universal/ToolTip.qml | 7 +++---- 21 files changed, 60 insertions(+), 70 deletions(-) (limited to 'src/imports/controls') diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index b461fdfe..94c05c40 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -47,8 +47,8 @@ T.Button { baselineOffset: contentItem.y + contentItem.baselineOffset padding: 6 - leftPadding: 8 - rightPadding: 8 + leftPadding: padding + 2 + rightPadding: padding + 2 //! [contentItem] contentItem: Text { diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml index 18092a83..da9e8fe2 100644 --- a/src/imports/controls/ComboBox.qml +++ b/src/imports/controls/ComboBox.qml @@ -51,8 +51,8 @@ T.ComboBox { spacing: 8 padding: 6 - leftPadding: 12 - rightPadding: 12 + leftPadding: padding + 6 + rightPadding: padding + 6 opacity: enabled ? 1 : 0.3 diff --git a/src/imports/controls/SpinBox.qml b/src/imports/controls/SpinBox.qml index 9ea9d5ef..81bbb1b2 100644 --- a/src/imports/controls/SpinBox.qml +++ b/src/imports/controls/SpinBox.qml @@ -51,8 +51,8 @@ T.SpinBox { baselineOffset: contentItem.y + contentItem.baselineOffset padding: 6 - leftPadding: 6 + (control.mirrored ? (up.indicator ? up.indicator.width : 0) : (down.indicator ? down.indicator.width : 0)) - rightPadding: 6 + (control.mirrored ? (down.indicator ? down.indicator.width : 0) : (up.indicator ? up.indicator.width : 0)) + leftPadding: padding + (control.mirrored ? (up.indicator ? up.indicator.width : 0) : (down.indicator ? down.indicator.width : 0)) + rightPadding: padding + (control.mirrored ? (down.indicator ? down.indicator.width : 0) : (up.indicator ? up.indicator.width : 0)) opacity: control.enabled ? 1 : 0.3 //! [validator] diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml index a109cb8d..f1ec6dfa 100644 --- a/src/imports/controls/TextArea.qml +++ b/src/imports/controls/TextArea.qml @@ -48,7 +48,7 @@ T.TextArea { placeholder.implicitHeight + topPadding + bottomPadding) padding: 6 - leftPadding: 10 + leftPadding: padding + 4 opacity: enabled ? 1 : 0.2 color: "#353637" diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index d020ae49..aea83dde 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -46,7 +46,7 @@ T.TextField { placeholder.implicitHeight + topPadding + bottomPadding) padding: 6 - leftPadding: 10 + leftPadding: padding + 4 opacity: enabled ? 1 : 0.2 color: "#353637" 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 diff --git a/src/imports/controls/universal/Button.qml b/src/imports/controls/universal/Button.qml index f31c5381..60a2ac51 100644 --- a/src/imports/controls/universal/Button.qml +++ b/src/imports/controls/universal/Button.qml @@ -47,10 +47,9 @@ T.Button { contentItem.implicitHeight + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset - topPadding: 4 - leftPadding: 8 - rightPadding: 8 - bottomPadding: 4 + padding: 8 + topPadding: padding - 4 + bottomPadding: padding - 4 property bool useSystemFocusVisuals: true diff --git a/src/imports/controls/universal/CheckDelegate.qml b/src/imports/controls/universal/CheckDelegate.qml index d693ead1..9441c7b0 100644 --- a/src/imports/controls/universal/CheckDelegate.qml +++ b/src/imports/controls/universal/CheckDelegate.qml @@ -50,10 +50,9 @@ T.CheckDelegate { spacing: 12 - topPadding: 11 - leftPadding: 12 - rightPadding: 12 - bottomPadding: 13 + padding: 12 + topPadding: padding - 1 + bottomPadding: padding + 1 //! [indicator] indicator: CheckIndicator { diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml index 113ce24b..6d550aa2 100644 --- a/src/imports/controls/universal/ComboBox.qml +++ b/src/imports/controls/universal/ComboBox.qml @@ -51,10 +51,10 @@ T.ComboBox { baselineOffset: contentItem.y + contentItem.baselineOffset spacing: 10 - topPadding: 5 - leftPadding: 12 - rightPadding: 10 - bottomPadding: 7 + padding: 12 + topPadding: padding - 7 + rightPadding: padding - 2 + bottomPadding: padding - 5 //! [delegate] delegate: ItemDelegate { diff --git a/src/imports/controls/universal/ItemDelegate.qml b/src/imports/controls/universal/ItemDelegate.qml index e02eac69..af239e4c 100644 --- a/src/imports/controls/universal/ItemDelegate.qml +++ b/src/imports/controls/universal/ItemDelegate.qml @@ -50,10 +50,9 @@ T.ItemDelegate { spacing: 12 - topPadding: 11 - leftPadding: 12 - rightPadding: 12 - bottomPadding: 13 + padding: 12 + topPadding: padding - 1 + bottomPadding: padding + 1 //! [contentItem] contentItem: Text { diff --git a/src/imports/controls/universal/MenuItem.qml b/src/imports/controls/universal/MenuItem.qml index 843e96b0..342c0d70 100644 --- a/src/imports/controls/universal/MenuItem.qml +++ b/src/imports/controls/universal/MenuItem.qml @@ -48,10 +48,9 @@ T.MenuItem { indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset - topPadding: 11 - leftPadding: 12 - rightPadding: 12 - bottomPadding: 13 + padding: 12 + topPadding: padding - 1 + bottomPadding: padding + 1 spacing: 12 //! [contentItem] diff --git a/src/imports/controls/universal/RadioDelegate.qml b/src/imports/controls/universal/RadioDelegate.qml index 9fe984bd..8bf05d2d 100644 --- a/src/imports/controls/universal/RadioDelegate.qml +++ b/src/imports/controls/universal/RadioDelegate.qml @@ -50,10 +50,9 @@ T.RadioDelegate { spacing: 12 - topPadding: 11 - leftPadding: 12 - rightPadding: 12 - bottomPadding: 13 + padding: 12 + topPadding: padding - 1 + bottomPadding: padding + 1 property Item control diff --git a/src/imports/controls/universal/SpinBox.qml b/src/imports/controls/universal/SpinBox.qml index cb79bb5e..49fa6954 100644 --- a/src/imports/controls/universal/SpinBox.qml +++ b/src/imports/controls/universal/SpinBox.qml @@ -52,10 +52,11 @@ T.SpinBox { baselineOffset: contentItem.y + contentItem.baselineOffset // TextControlThemePadding + 2 (border) - topPadding: 5 - bottomPadding: 7 - leftPadding: 12 + (control.mirrored ? (up.indicator ? up.indicator.width : 0) : (down.indicator ? down.indicator.width : 0)) - rightPadding: 8 + (control.mirrored ? (down.indicator ? down.indicator.width : 0) : (up.indicator ? up.indicator.width : 0)) + padding: 12 + topPadding: padding - 7 + leftPadding: padding + (control.mirrored ? (up.indicator ? up.indicator.width : 0) : (down.indicator ? down.indicator.width : 0)) + rightPadding: padding - 4 + (control.mirrored ? (down.indicator ? down.indicator.width : 0) : (up.indicator ? up.indicator.width : 0)) + bottomPadding: padding - 5 Universal.theme: activeFocus ? Universal.Light : undefined diff --git a/src/imports/controls/universal/SwipeDelegate.qml b/src/imports/controls/universal/SwipeDelegate.qml index bc9e4429..d11983e3 100644 --- a/src/imports/controls/universal/SwipeDelegate.qml +++ b/src/imports/controls/universal/SwipeDelegate.qml @@ -50,10 +50,9 @@ T.SwipeDelegate { spacing: 12 - topPadding: 11 - leftPadding: 12 - rightPadding: 12 - bottomPadding: 13 + padding: 12 + topPadding: padding - 1 + bottomPadding: padding + 1 //! [contentItem] contentItem: Text { diff --git a/src/imports/controls/universal/SwitchDelegate.qml b/src/imports/controls/universal/SwitchDelegate.qml index 25652f1b..43a1c4e2 100644 --- a/src/imports/controls/universal/SwitchDelegate.qml +++ b/src/imports/controls/universal/SwitchDelegate.qml @@ -50,10 +50,9 @@ T.SwitchDelegate { spacing: 12 - topPadding: 11 - leftPadding: 12 - rightPadding: 12 - bottomPadding: 13 + padding: 12 + topPadding: padding - 1 + bottomPadding: padding + 1 //! [indicator] indicator: SwitchIndicator { diff --git a/src/imports/controls/universal/TextArea.qml b/src/imports/controls/universal/TextArea.qml index e326512b..b4c38135 100644 --- a/src/imports/controls/universal/TextArea.qml +++ b/src/imports/controls/universal/TextArea.qml @@ -49,10 +49,10 @@ T.TextArea { placeholder.implicitHeight + topPadding + bottomPadding) // TextControlThemePadding + 2 (border) - topPadding: 5 - leftPadding: 12 - rightPadding: 8 - bottomPadding: 7 + padding: 12 + topPadding: padding - 7 + rightPadding: padding - 4 + bottomPadding: padding - 5 Universal.theme: activeFocus ? Universal.Light : undefined diff --git a/src/imports/controls/universal/TextField.qml b/src/imports/controls/universal/TextField.qml index 69046e48..041cf0e8 100644 --- a/src/imports/controls/universal/TextField.qml +++ b/src/imports/controls/universal/TextField.qml @@ -49,10 +49,10 @@ T.TextField { placeholder.implicitHeight + topPadding + bottomPadding) // TextControlThemePadding + 2 (border) - topPadding: 5 - leftPadding: 12 - rightPadding: 8 - bottomPadding: 7 + padding: 12 + topPadding: padding - 7 + rightPadding: padding - 4 + bottomPadding: padding - 5 Universal.theme: activeFocus ? Universal.Light : undefined diff --git a/src/imports/controls/universal/ToolTip.qml b/src/imports/controls/universal/ToolTip.qml index 705800c8..16576811 100644 --- a/src/imports/controls/universal/ToolTip.qml +++ b/src/imports/controls/universal/ToolTip.qml @@ -50,10 +50,9 @@ T.ToolTip { contentItem.implicitHeight + topPadding + bottomPadding) margins: 8 - topPadding: 5 - leftPadding: 8 - rightPadding: 8 - bottomPadding: 7 + padding: 8 + topPadding: padding - 3 + bottomPadding: padding - 1 closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnReleaseOutsideParent -- cgit v1.2.3