diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-07-09 15:35:46 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-07-09 13:57:50 +0000 |
| commit | 185613f2eecb094cd119558c807679fc34929b05 (patch) | |
| tree | 7c8dc57e648f361ee34688ef159266b072d2e59c /src/imports/controls | |
| parent | b4dddacae65c07ceba68fee24d8f1fa56c65977a (diff) | |
Fix visual padding
All delegate items should use availableWidth/Height instead
of the whole control width/height to respect paddings.
Change-Id: Ia299fab3daad6853a163c10f59e590c8fbab1783
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls')
| -rw-r--r-- | src/imports/controls/BusyIndicator.qml | 8 | ||||
| -rw-r--r-- | src/imports/controls/CheckBox.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/RadioButton.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/Switch.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/ToggleButton.qml | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml index f67728c5..0a16979a 100644 --- a/src/imports/controls/BusyIndicator.qml +++ b/src/imports/controls/BusyIndicator.qml @@ -52,10 +52,10 @@ AbstractBusyIndicator { id: delegate implicitWidth: 48 implicitHeight: 48 - x: (parent.width - width) / 2 - y: (parent.height - height) / 2 - width: parent.width - height: parent.height + x: control.leftPadding + (control.availableWidth - width) / 2 + y: control.topPadding + (control.availableHeight - height) / 2 + width: control.availableWidth + height: control.availableHeight opacity: control.running ? 1 : 0 Behavior on opacity { OpacityAnimator { duration: 250 } } diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml index 9db6aaa4..37f61cf9 100644 --- a/src/imports/controls/CheckBox.qml +++ b/src/imports/controls/CheckBox.qml @@ -60,8 +60,8 @@ AbstractCheckBox { indicator: Rectangle { implicitWidth: 20 implicitHeight: 20 - x: text ? (control.mirrored ? parent.width - width - control.rightPadding : control.leftPadding) : (parent.width - width) / 2 - y: (parent.height - height) / 2 + x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + y: control.topPadding + (control.availableHeight - height) / 2 radius: 3 border.width: control.activeFocus ? 2 : 1 diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml index 262a28de..1f19b031 100644 --- a/src/imports/controls/RadioButton.qml +++ b/src/imports/controls/RadioButton.qml @@ -60,8 +60,8 @@ AbstractRadioButton { indicator: Rectangle { implicitWidth: 20 implicitHeight: 20 - x: text ? (control.mirrored ? parent.width - width - control.rightPadding : control.leftPadding) : (parent.width - width) / 2 - y: (parent.height - height) / 2 + x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + y: control.topPadding + (control.availableHeight - height) / 2 radius: width / 2 border.width: control.activeFocus ? 2 : 1 diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml index 24ac8297..c38e36cb 100644 --- a/src/imports/controls/Switch.qml +++ b/src/imports/controls/Switch.qml @@ -61,8 +61,8 @@ AbstractSwitch { indicator: Rectangle { implicitWidth: 36 implicitHeight: 20 - x: text ? (control.mirrored ? parent.width - width - control.rightPadding : control.leftPadding) : (parent.width - width) / 2 - y: (parent.height - height) / 2 + x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + y: control.topPadding + (control.availableHeight - height) / 2 radius: 10 border.width: control.activeFocus ? 2 : 1 diff --git a/src/imports/controls/ToggleButton.qml b/src/imports/controls/ToggleButton.qml index bdb9849a..f64bad97 100644 --- a/src/imports/controls/ToggleButton.qml +++ b/src/imports/controls/ToggleButton.qml @@ -61,8 +61,8 @@ AbstractToggleButton { indicator: Rectangle { implicitWidth: 36 implicitHeight: 20 - x: text ? (control.mirrored ? parent.width - width - control.rightPadding : control.leftPadding) : (parent.width - width) / 2 - y: (parent.height - height) / 2 + x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + y: control.topPadding + (control.availableHeight - height) / 2 radius: 3 border.width: control.activeFocus ? 2 : 1 |