From 5047b7162ff3129749d6d736e6900eaf61f74bfe Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 21 Apr 2016 11:38:21 +0200 Subject: Replace activeFocus with activeKeyFocus Change-Id: If3b89c2bf1eeed48ecd21739c49914e62f38ac24 Task-number: QTBUG-51796 Reviewed-by: Mitch Curtis --- src/imports/controls/SwitchIndicator.qml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/imports/controls/SwitchIndicator.qml') diff --git a/src/imports/controls/SwitchIndicator.qml b/src/imports/controls/SwitchIndicator.qml index 2b169976..cd4e2c73 100644 --- a/src/imports/controls/SwitchIndicator.qml +++ b/src/imports/controls/SwitchIndicator.qml @@ -47,9 +47,9 @@ Item { width: 56 height: 16 radius: 8 - color: control.checked ? (control.activeFocus ? "#0066ff" : "#353637") : "#ffffff" - border.width: control.activeFocus ? 2 : 1 - border.color: control.checked ? "transparent" : (control.activeFocus ? "#0066ff" : "#353637") + color: control.checked ? (control.activeKeyFocus ? "#0066ff" : "#353637") : "#ffffff" + border.width: control.activeKeyFocus ? 2 : 1 + border.color: control.checked ? "transparent" : (control.activeKeyFocus ? "#0066ff" : "#353637") } Rectangle { @@ -58,9 +58,9 @@ Item { width: 28 height: 28 radius: 16 - color: control.pressed ? (control.activeFocus ? "#cce0ff" : "#e4e4e4") : (control.activeFocus ? "#f0f6ff" : "#f6f6f6") - border.width: control.activeFocus ? 2 : 1 - border.color: control.activeFocus ? "#0066ff" : (control.pressed ? "#26282a" : "#353637") + color: control.pressed ? (control.activeKeyFocus ? "#cce0ff" : "#e4e4e4") : (control.activeKeyFocus ? "#f0f6ff" : "#f6f6f6") + border.width: control.activeKeyFocus ? 2 : 1 + border.color: control.activeKeyFocus ? "#0066ff" : (control.pressed ? "#26282a" : "#353637") Behavior on x { enabled: !control.pressed -- cgit v1.2.3