From 32301fece33d1c597776fa8f3b14e7a03e436db5 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 22 May 2015 13:00:06 +0200 Subject: Expose read-only bool Control::mirrored property for convenience Change-Id: Icbb39aa1c3ac6f4b00adbc59c09a6c79e99bafd3 Reviewed-by: J-P Nurmi --- src/imports/controls/CheckBox.qml | 8 ++------ src/imports/controls/ProgressBar.qml | 2 +- src/imports/controls/RadioButton.qml | 8 ++------ src/imports/controls/Slider.qml | 2 +- src/imports/controls/Switch.qml | 8 ++------ src/imports/controls/ToggleButton.qml | 8 ++------ 6 files changed, 10 insertions(+), 26 deletions(-) (limited to 'src/imports/controls') diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml index f149bcbb..e16eb73a 100644 --- a/src/imports/controls/CheckBox.qml +++ b/src/imports/controls/CheckBox.qml @@ -56,11 +56,9 @@ AbstractCheckBox { padding: Theme.padding indicator: Rectangle { - readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft - implicitWidth: 20 implicitHeight: 20 - x: text ? (mirror ? parent.width - width - control.rightPadding : control.leftPadding) : (parent.width - width) / 2 + x: text ? (control.mirrored ? parent.width - width - control.rightPadding : control.leftPadding) : (parent.width - width) / 2 y: (parent.height - height) / 2 radius: control.Theme.roundness @@ -83,9 +81,7 @@ AbstractCheckBox { } label: Text { - readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft - - x: mirror ? control.leftPadding : (indicator.x + indicator.width + control.Theme.spacing) + x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.Theme.spacing) y: control.topPadding width: parent.width - indicator.width - control.Theme.spacing - control.leftPadding - control.rightPadding height: parent.height - control.topPadding - control.bottomPadding diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml index 6cf95a58..cd4b4213 100644 --- a/src/imports/controls/ProgressBar.qml +++ b/src/imports/controls/ProgressBar.qml @@ -55,7 +55,7 @@ AbstractProgressBar { width: parent.width - control.leftPadding - control.rightPadding height: parent.height - control.topPadding - control.bottomPadding - scale: control.effectiveLayoutDirection === Qt.RightToLeft ? -1 : 1 + scale: control.mirrored ? -1 : 1 Repeater { model: indeterminate ? 2 : 1 diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml index a73605ff..74fea92e 100644 --- a/src/imports/controls/RadioButton.qml +++ b/src/imports/controls/RadioButton.qml @@ -56,11 +56,9 @@ AbstractRadioButton { padding: Theme.padding indicator: Rectangle { - readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft - implicitWidth: 20 implicitHeight: 20 - x: text ? (mirror ? parent.width - width - control.rightPadding : control.leftPadding) : (parent.width - width) / 2 + x: text ? (control.mirrored ? parent.width - width - control.rightPadding : control.leftPadding) : (parent.width - width) / 2 y: (parent.height - height) / 2 radius: width / 2 @@ -84,9 +82,7 @@ AbstractRadioButton { } label: Text { - readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft - - x: mirror ? control.leftPadding : (indicator.x + indicator.width + control.Theme.spacing) + x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.Theme.spacing) y: control.topPadding width: parent.width - indicator.width - control.Theme.spacing - control.leftPadding - control.rightPadding height: parent.height - control.topPadding - control.bottomPadding diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml index 284a0b2f..850791e0 100644 --- a/src/imports/controls/Slider.qml +++ b/src/imports/controls/Slider.qml @@ -89,7 +89,7 @@ AbstractSlider { radius: control.Theme.roundness border.color: control.Theme.frameColor color: control.Theme.backgroundColor - scale: horizontal && control.effectiveLayoutDirection === Qt.RightToLeft ? -1 : 1 + scale: horizontal && control.mirrored ? -1 : 1 Rectangle { x: 2 diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml index 518c07ad..6bc8a02d 100644 --- a/src/imports/controls/Switch.qml +++ b/src/imports/controls/Switch.qml @@ -57,11 +57,9 @@ AbstractSwitch { padding: Theme.padding indicator: Rectangle { - readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft - implicitWidth: 36 implicitHeight: 20 - x: text ? (mirror ? parent.width - width - control.rightPadding : control.leftPadding) : (parent.width - width) / 2 + x: text ? (control.mirrored ? parent.width - width - control.rightPadding : control.leftPadding) : (parent.width - width) / 2 y: (parent.height - height) / 2 radius: 10 @@ -93,9 +91,7 @@ AbstractSwitch { } label: Text { - readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft - - x: mirror ? control.leftPadding : (indicator.x + indicator.width + control.Theme.spacing) + x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.Theme.spacing) y: control.topPadding width: parent.width - indicator.width - control.Theme.spacing - control.leftPadding - control.rightPadding height: parent.height - control.topPadding - control.bottomPadding diff --git a/src/imports/controls/ToggleButton.qml b/src/imports/controls/ToggleButton.qml index fdf921e1..185f2eee 100644 --- a/src/imports/controls/ToggleButton.qml +++ b/src/imports/controls/ToggleButton.qml @@ -57,11 +57,9 @@ AbstractToggleButton { padding: Theme.padding indicator: Rectangle { - readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft - implicitWidth: 36 implicitHeight: 20 - x: text ? (mirror ? parent.width - width - control.rightPadding : control.leftPadding) : (parent.width - width) / 2 + x: text ? (control.mirrored ? parent.width - width - control.rightPadding : control.leftPadding) : (parent.width - width) / 2 y: (parent.height - height) / 2 radius: control.Theme.roundness @@ -92,9 +90,7 @@ AbstractToggleButton { } label: Text { - readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft - - x: mirror ? control.leftPadding : (indicator.x + indicator.width + control.Theme.spacing) + x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.Theme.spacing) y: control.topPadding width: parent.width - indicator.width - control.Theme.spacing - control.leftPadding - control.rightPadding height: parent.height - control.topPadding - control.bottomPadding -- cgit v1.2.3