diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-31 16:05:25 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-31 17:38:37 +0100 |
| commit | 19b967506deea84a0d56375e5bcca48168a3cfc8 (patch) | |
| tree | bf488dc01069b7850cceff182c2241ed13db69c6 /src/imports/controls/material/Switch.qml | |
| parent | 8318deb165047d592523ec0b2fd10510d4953b37 (diff) | |
| parent | 7fc567eda8a187e365f4c29c6e8f08440bf31218 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/templates/qquickpopup.cpp
src/templates/qquickpopup_p_p.h
src/templates/qquickspinbox_p.h
Change-Id: Ief25ad2d27410f62e90879f60499ed87359406c3
Diffstat (limited to 'src/imports/controls/material/Switch.qml')
| -rw-r--r-- | src/imports/controls/material/Switch.qml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/imports/controls/material/Switch.qml b/src/imports/controls/material/Switch.qml index b1a69286..3b9bb18f 100644 --- a/src/imports/controls/material/Switch.qml +++ b/src/imports/controls/material/Switch.qml @@ -52,20 +52,20 @@ T.Switch { indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) baselineOffset: label ? label.y + label.baselineOffset : 0 - padding: 6 - spacing: 6 + padding: 8 + spacing: 8 //! [indicator] indicator: Item { x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 - implicitWidth: 40 - implicitHeight: 20 + implicitWidth: 38 + implicitHeight: 32 Ripple { x: handle.x + handle.width / 2 - width / 2 y: handle.y + handle.height / 2 - height / 2 - width: handle.width - 4 + width: handle.width height: width control: control colored: control.checked @@ -74,7 +74,7 @@ T.Switch { Rectangle { width: parent.width - height: 16 + height: 14 radius: height / 2 y: parent.height / 2 - height / 2 color: control.enabled ? (control.checked ? control.Material.switchCheckedTrackColor : control.Material.switchUncheckedTrackColor) @@ -85,8 +85,8 @@ T.Switch { id: handle x: Math.max(0, Math.min(parent.width - width, control.visualPosition * parent.width - (width / 2))) y: (parent.height - height) / 2 - width: 24 - height: 24 + width: 20 + height: 20 radius: width / 2 color: control.enabled ? (control.checked ? control.Material.switchCheckedHandleColor : control.Material.switchUncheckedHandleColor) : control.Material.switchDisabledHandleColor |