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/CheckIndicator.qml | 8 ++++---- src/imports/controls/Dial.qml | 2 +- src/imports/controls/RadioIndicator.qml | 6 +++--- src/imports/controls/SwitchIndicator.qml | 12 ++++++------ src/imports/controls/material/RadioIndicator.qml | 2 +- src/imports/controls/universal/CheckDelegate.qml | 4 ++-- src/imports/controls/universal/RadioDelegate.qml | 4 ++-- src/imports/controls/universal/SwitchDelegate.qml | 4 ++-- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/imports/controls/CheckIndicator.qml b/src/imports/controls/CheckIndicator.qml index 585bdb25..fbaf86af 100644 --- a/src/imports/controls/CheckIndicator.qml +++ b/src/imports/controls/CheckIndicator.qml @@ -44,9 +44,9 @@ Rectangle { implicitWidth: 28 implicitHeight: 28 - color: control.enabled ? (control.down ? (control.activeFocus ? "#cce0ff" : "#e4e4e4") : "#f6f6f6") : "#353637" - border.width: control.activeFocus ? 2 : 1 - border.color: control.enabled ? (control.activeFocus ? "#0066ff" : (control.down ? "#26282a" : "#353637")) : "transparent" + color: control.enabled ? (control.down ? (control.activeKeyFocus ? "#cce0ff" : "#e4e4e4") : "#f6f6f6") : "#353637" + border.width: control.activeKeyFocus ? 2 : 1 + border.color: control.enabled ? (control.activeKeyFocus ? "#0066ff" : (control.down ? "#26282a" : "#353637")) : "transparent" Image { x: (parent.width - width) / 2 @@ -60,7 +60,7 @@ Rectangle { y: (parent.height - height) / 2 width: 16 height: 3 - color: control.activeFocus ? "#0066ff" : "#353637" + color: control.activeKeyFocus ? "#0066ff" : "#353637" visible: control.checkState === Qt.PartiallyChecked } } diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml index b02aae17..41e8e5e0 100644 --- a/src/imports/controls/Dial.qml +++ b/src/imports/controls/Dial.qml @@ -48,7 +48,7 @@ T.Dial { background: DialRing { width: control.availableWidth height: control.availableHeight - color: control.activeFocus ? "#0066ff" : "#353637" + color: control.activeKeyFocus ? "#0066ff" : "#353637" progress: control.position opacity: control.enabled ? 1 : 0.3 } diff --git a/src/imports/controls/RadioIndicator.qml b/src/imports/controls/RadioIndicator.qml index 041f8f3e..68b283c0 100644 --- a/src/imports/controls/RadioIndicator.qml +++ b/src/imports/controls/RadioIndicator.qml @@ -41,9 +41,9 @@ Rectangle { implicitHeight: 28 radius: width / 2 - color: control.down ? (control.activeFocus ? "#cce0ff" : "#e4e4e4") : "#f6f6f6" - border.width: control.activeFocus ? 2 : 1 - border.color: control.activeFocus ? "#0066ff" : (control.down ? "#26282a" : "#353637") + color: control.down ? (control.activeKeyFocus ? "#cce0ff" : "#e4e4e4") : "#f6f6f6" + border.width: control.activeKeyFocus ? 2 : 1 + border.color: control.activeKeyFocus ? "#0066ff" : (control.down ? "#26282a" : "#353637") property Item control 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 diff --git a/src/imports/controls/material/RadioIndicator.qml b/src/imports/controls/material/RadioIndicator.qml index 27ab8d9a..0d4b9c9c 100644 --- a/src/imports/controls/material/RadioIndicator.qml +++ b/src/imports/controls/material/RadioIndicator.qml @@ -54,7 +54,7 @@ Rectangle { height: width control: control colored: control.checked - opacity: control.down || control.activeFocus ? 1 : 0 + opacity: control.down || control.activeKeyFocus ? 1 : 0 } Rectangle { diff --git a/src/imports/controls/universal/CheckDelegate.qml b/src/imports/controls/universal/CheckDelegate.qml index b6c8564b..344183f5 100644 --- a/src/imports/controls/universal/CheckDelegate.qml +++ b/src/imports/controls/universal/CheckDelegate.qml @@ -82,12 +82,12 @@ T.CheckDelegate { //! [background] background: Rectangle { - visible: control.down || control.highlighted || control.activeFocus + visible: control.down || control.highlighted || control.activeKeyFocus color: control.down ? control.Universal.listMediumColor : control.Universal.altMediumLowColor Rectangle { width: parent.width height: parent.height - visible: control.activeFocus || control.highlighted + visible: control.activeKeyFocus || control.highlighted color: control.Universal.accent opacity: control.Universal.theme === Universal.Light ? 0.4 : 0.6 } diff --git a/src/imports/controls/universal/RadioDelegate.qml b/src/imports/controls/universal/RadioDelegate.qml index a138863b..58128df3 100644 --- a/src/imports/controls/universal/RadioDelegate.qml +++ b/src/imports/controls/universal/RadioDelegate.qml @@ -84,12 +84,12 @@ T.RadioDelegate { //! [background] background: Rectangle { - visible: control.down || control.highlighted || control.activeFocus + visible: control.down || control.highlighted || control.activeKeyFocus color: control.down ? control.Universal.listMediumColor : control.Universal.altMediumLowColor Rectangle { width: parent.width height: parent.height - visible: control.activeFocus || control.highlighted + visible: control.activeKeyFocus || control.highlighted color: control.Universal.accent opacity: control.Universal.theme === Universal.Light ? 0.4 : 0.6 } diff --git a/src/imports/controls/universal/SwitchDelegate.qml b/src/imports/controls/universal/SwitchDelegate.qml index 96dc5d69..85dd25f4 100644 --- a/src/imports/controls/universal/SwitchDelegate.qml +++ b/src/imports/controls/universal/SwitchDelegate.qml @@ -82,12 +82,12 @@ T.SwitchDelegate { //! [background] background: Rectangle { - visible: control.down || control.highlighted || control.activeFocus + visible: control.down || control.highlighted || control.activeKeyFocus color: control.down ? control.Universal.listMediumColor : control.Universal.altMediumLowColor Rectangle { width: parent.width height: parent.height - visible: control.activeFocus || control.highlighted + visible: control.activeKeyFocus || control.highlighted color: control.Universal.accent opacity: control.Universal.theme === Universal.Light ? 0.4 : 0.6 } -- cgit v1.2.3