From ad6a1b0d26dee4e6474b73f9363fb6726e304e14 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 5 Mar 2015 23:44:00 +0100 Subject: Add Control::padding for convenience Change-Id: I9a472e2378854ba07ce34ad571f54b0fa4a3755c Reviewed-by: Jari-Pekka Nurmi --- src/imports/controls/BusyIndicator.qml | 5 +---- src/imports/controls/Button.qml | 5 +---- src/imports/controls/CheckBox.qml | 5 +---- src/imports/controls/Frame.qml | 5 +---- src/imports/controls/GroupBox.qml | 4 +--- src/imports/controls/PageIndicator.qml | 5 +---- src/imports/controls/ProgressBar.qml | 5 +---- src/imports/controls/RadioButton.qml | 5 +---- src/imports/controls/ScrollBar.qml | 5 +---- src/imports/controls/ScrollIndicator.qml | 5 +---- src/imports/controls/Slider.qml | 5 +---- src/imports/controls/Switch.qml | 5 +---- src/imports/controls/TabButton.qml | 5 +---- src/imports/controls/TextField.qml | 5 +---- src/imports/controls/ToggleButton.qml | 5 +---- src/imports/controls/ToolButton.qml | 5 +---- 16 files changed, 16 insertions(+), 63 deletions(-) (limited to 'src/imports/controls') diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml index f13b579f..690940b0 100644 --- a/src/imports/controls/BusyIndicator.qml +++ b/src/imports/controls/BusyIndicator.qml @@ -45,10 +45,7 @@ AbstractBusyIndicator { Accessible.role: Accessible.Indicator - topPadding: style.padding - leftPadding: style.padding - rightPadding: style.padding - bottomPadding: style.padding + padding: style.padding indicator: Item { id: delegate diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index f77e5685..b54856a9 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -49,10 +49,7 @@ AbstractButton { Accessible.pressed: pressed Accessible.role: Accessible.Button - topPadding: style.padding - leftPadding: style.padding - rightPadding: style.padding - bottomPadding: style.padding + padding: style.padding label: Text { x: control.leftPadding diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml index b100fcb5..559fda3b 100644 --- a/src/imports/controls/CheckBox.qml +++ b/src/imports/controls/CheckBox.qml @@ -53,10 +53,7 @@ AbstractCheckBox { Accessible.pressed: pressed Accessible.role: Accessible.CheckBox - topPadding: style.padding - leftPadding: style.padding - rightPadding: style.padding - bottomPadding: style.padding + padding: style.padding indicator: Rectangle { readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft diff --git a/src/imports/controls/Frame.qml b/src/imports/controls/Frame.qml index 766e5e30..bff6dd68 100644 --- a/src/imports/controls/Frame.qml +++ b/src/imports/controls/Frame.qml @@ -50,10 +50,7 @@ AbstractFrame { contentWidth: content.children.length === 1 ? content.children[0].implicitWidth : 0 contentHeight: content.children.length === 1 ? content.children[0].implicitHeight : 0 - topPadding: style.padding - leftPadding: style.padding - rightPadding: style.padding - bottomPadding: style.padding + padding: style.padding contentItem: Item { id: content diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml index 2e278e3a..f3f032a8 100644 --- a/src/imports/controls/GroupBox.qml +++ b/src/imports/controls/GroupBox.qml @@ -50,10 +50,8 @@ AbstractGroupBox { contentWidth: content.children.length === 1 ? content.children[0].implicitWidth : 0 contentHeight: content.children.length === 1 ? content.children[0].implicitHeight : 0 + padding: style.padding topPadding: style.padding + (label && title ? label.implicitHeight + style.spacing : 0) - leftPadding: style.padding - rightPadding: style.padding - bottomPadding: style.padding contentItem: Item { id: content diff --git a/src/imports/controls/PageIndicator.qml b/src/imports/controls/PageIndicator.qml index 23a4a28d..28913866 100644 --- a/src/imports/controls/PageIndicator.qml +++ b/src/imports/controls/PageIndicator.qml @@ -61,10 +61,7 @@ AbstractPageIndicator { implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) - topPadding: style.padding - leftPadding: style.padding - rightPadding: style.padding - bottomPadding: style.padding + padding: style.padding contentItem: Row { id: row diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml index bb3ac3a3..9e136fc2 100644 --- a/src/imports/controls/ProgressBar.qml +++ b/src/imports/controls/ProgressBar.qml @@ -47,10 +47,7 @@ AbstractProgressBar { Accessible.role: Accessible.ProgressBar - topPadding: style.padding - leftPadding: style.padding - rightPadding: style.padding - bottomPadding: style.padding + padding: style.padding indicator: Item { x: control.leftPadding diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml index 82ecc10c..51fb0192 100644 --- a/src/imports/controls/RadioButton.qml +++ b/src/imports/controls/RadioButton.qml @@ -53,10 +53,7 @@ AbstractRadioButton { Accessible.pressed: pressed Accessible.role: Accessible.RadioButton - topPadding: style.padding - leftPadding: style.padding - rightPadding: style.padding - bottomPadding: style.padding + padding: style.padding indicator: Rectangle { readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft diff --git a/src/imports/controls/ScrollBar.qml b/src/imports/controls/ScrollBar.qml index e14b64ff..704ad503 100644 --- a/src/imports/controls/ScrollBar.qml +++ b/src/imports/controls/ScrollBar.qml @@ -48,10 +48,7 @@ AbstractScrollBar { Accessible.pressed: pressed Accessible.role: Accessible.ScrollBar - topPadding: 2 - leftPadding: 2 - rightPadding: 2 - bottomPadding: 2 + padding: 2 handle: Rectangle { id: handle diff --git a/src/imports/controls/ScrollIndicator.qml b/src/imports/controls/ScrollIndicator.qml index 0b361e87..1fc1ddda 100644 --- a/src/imports/controls/ScrollIndicator.qml +++ b/src/imports/controls/ScrollIndicator.qml @@ -47,10 +47,7 @@ AbstractScrollIndicator { Accessible.role: Accessible.Indicator - topPadding: 2 - leftPadding: 2 - rightPadding: 2 - bottomPadding: 2 + padding: 2 indicator: Rectangle { id: indicator diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml index 82eac87e..5af9ec59 100644 --- a/src/imports/controls/Slider.qml +++ b/src/imports/controls/Slider.qml @@ -50,10 +50,7 @@ AbstractSlider { Accessible.pressed: pressed Accessible.role: Accessible.Slider - topPadding: style.padding - leftPadding: style.padding - rightPadding: style.padding - bottomPadding: style.padding + padding: style.padding handle: Rectangle { implicitWidth: 20 diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml index 4ce9801d..0b69000f 100644 --- a/src/imports/controls/Switch.qml +++ b/src/imports/controls/Switch.qml @@ -54,10 +54,7 @@ AbstractSwitch { Accessible.pressed: pressed Accessible.role: Accessible.Button // TODO: Switch? - topPadding: style.padding - leftPadding: style.padding - rightPadding: style.padding - bottomPadding: style.padding + padding: style.padding indicator: Rectangle { readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml index e1621c85..9a67b31e 100644 --- a/src/imports/controls/TabButton.qml +++ b/src/imports/controls/TabButton.qml @@ -50,10 +50,7 @@ AbstractTabButton { Accessible.selected: checked Accessible.role: Accessible.PageTab - topPadding: style.padding - leftPadding: style.padding - rightPadding: style.padding - bottomPadding: style.padding + padding: style.padding label: Text { x: control.leftPadding diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index 12d5e404..cad8c329 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -54,10 +54,7 @@ AbstractTextField { Accessible.passwordEdit: !!input && (input.echoMode == TextInput.Password || input.echoMode === TextInput.PasswordEchoOnEdit) - topPadding: style.padding - leftPadding: style.padding - rightPadding: style.padding - bottomPadding: style.padding + padding: style.padding input: TextInput { x: control.leftPadding diff --git a/src/imports/controls/ToggleButton.qml b/src/imports/controls/ToggleButton.qml index a043f290..4f82d7fb 100644 --- a/src/imports/controls/ToggleButton.qml +++ b/src/imports/controls/ToggleButton.qml @@ -54,10 +54,7 @@ AbstractToggleButton { Accessible.pressed: pressed Accessible.role: Accessible.Button - topPadding: style.padding - leftPadding: style.padding - rightPadding: style.padding - bottomPadding: style.padding + padding: style.padding indicator: Rectangle { readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml index 9f838cb0..5e21374d 100644 --- a/src/imports/controls/ToolButton.qml +++ b/src/imports/controls/ToolButton.qml @@ -49,10 +49,7 @@ AbstractButton { Accessible.pressed: pressed Accessible.role: Accessible.Button - topPadding: style.padding - leftPadding: style.padding - rightPadding: style.padding - bottomPadding: style.padding + padding: style.padding label: Text { x: control.leftPadding -- cgit v1.2.3