diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-06-28 14:19:31 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-06-30 07:40:00 +0000 |
| commit | 8ed484329fc277366d7bbcd63832b0effbbbbf9f (patch) | |
| tree | 31f54c6524f22efa5556fe75327ccbf06f0d9c11 /src/imports/controls/universal/SwitchIndicator.qml | |
| parent | f92e8de4557430281cdb92711a57af9d6e7b13c4 (diff) | |
Universal: implement hover effects
[ChangeLog][Universal] Implemented hover effects
Task-number: QTBUG-50003
Change-Id: I67d382b0aaef06fc9c16b734f735dcc62262b6f5
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/universal/SwitchIndicator.qml')
| -rw-r--r-- | src/imports/controls/universal/SwitchIndicator.qml | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/src/imports/controls/universal/SwitchIndicator.qml b/src/imports/controls/universal/SwitchIndicator.qml index b3d44d9e..18881e00 100644 --- a/src/imports/controls/universal/SwitchIndicator.qml +++ b/src/imports/controls/universal/SwitchIndicator.qml @@ -38,17 +38,24 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T import QtQuick.Controls.Universal 2.0 -Rectangle { +Item { implicitWidth: 44 implicitHeight: 20 - radius: 10 - color: !control.enabled ? "transparent" : - control.pressed ? control.Universal.baseMediumColor : - control.checked ? control.Universal.accent : "transparent" - border.color: !control.enabled ? control.Universal.baseLowColor : - control.checked && !control.pressed ? control.Universal.accent : control.Universal.baseMediumColor - border.width: 2 + Rectangle { + width: parent.width + height: parent.height + + radius: 10 + color: !control.enabled ? "transparent" : + control.pressed ? control.Universal.baseMediumColor : + control.checked ? control.Universal.accent : "transparent" + border.color: !control.enabled ? control.Universal.baseLowColor : + control.checked && !control.pressed ? control.Universal.accent : + control.hovered && !control.checked && !control.pressed ? control.Universal.baseHighColor : control.Universal.baseMediumColor + opacity: control.hovered && control.checked && !control.pressed ? (control.Universal.theme === Universal.Light ? 0.7 : 0.9) : 1.0 + border.width: 2 + } property Item control @@ -58,7 +65,8 @@ Rectangle { radius: 5 color: !control.enabled ? control.Universal.baseLowColor : - control.pressed || control.checked ? control.Universal.chromeWhiteColor : control.Universal.baseMediumHighColor + control.pressed || control.checked ? control.Universal.chromeWhiteColor : + control.hovered && !control.checked ? control.Universal.baseHighColor : control.Universal.baseMediumHighColor x: Math.max(5, Math.min(parent.width - width - 5, control.visualPosition * parent.width - (width / 2))) |