diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-10-31 15:06:32 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-11-02 09:12:22 +0000 |
| commit | 02c44ee00777a76c3bf13cd0705d91435654a4c1 (patch) | |
| tree | 1f169798ef77eaae93cded4b58f3801163b620cc /src/imports/controls/Switch.qml | |
| parent | 1350b91aaf9a343d721ea085fd924812e518ccbd (diff) | |
Default: merge SwitchIndicator back to Switch & SwitchDelegate
See the previous commit (CheckIndicator) for more details.
Before:
running: /home/jpnurmi/Projects/qmlbench/benchmarks/auto/creation/quick.controls2/delegates_switch.qml
[...]
Average: 87.8 frames; using samples; MedianAll=87; StdDev=2.16795, CoV=0.0246919
After:
running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_switch.qml
[...]
Average: 92.6 frames; using samples; MedianAll=92; StdDev=2.19089, CoV=0.0236597
Change-Id: Iea9e88e4e771ac27d336c2c87232704d33a226ec
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/Switch.qml')
| -rw-r--r-- | src/imports/controls/Switch.qml | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml index 66f624d9..71317967 100644 --- a/src/imports/controls/Switch.qml +++ b/src/imports/controls/Switch.qml @@ -52,10 +52,34 @@ T.Switch { padding: 6 spacing: 6 - indicator: SwitchIndicator { + indicator: PaddedRectangle { + implicitWidth: 56 + implicitHeight: 28 + x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 - control: control + + radius: 8 + leftPadding: 0 + rightPadding: 0 + padding: (height - 16) / 2 + color: control.checked ? control.palette.dark : control.palette.midlight + + Rectangle { + x: Math.max(0, Math.min(parent.width - width, control.visualPosition * parent.width - (width / 2))) + y: (parent.height - height) / 2 + width: 28 + height: 28 + radius: 16 + color: control.down ? control.palette.light : control.palette.window + border.width: control.visualFocus ? 2 : 1 + border.color: control.visualFocus ? control.palette.highlight : control.enabled ? control.palette.mid : control.palette.midlight + + Behavior on x { + enabled: !control.down + SmoothedAnimation { velocity: 200 } + } + } } contentItem: CheckLabel { |