diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-04-26 12:42:10 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-04-26 13:31:18 +0000 |
commit | 345fb099aa08c72d380fed3330cc8b9d088a3cb4 (patch) | |
tree | 4cf28ead358bc333a27e6b794ca439ad27938289 /src/imports/controls/CheckIndicator.qml | |
parent | 67f3da65d7d11af025a9bdd54d08ca0bf764c3ce (diff) |
Control: rename activeKeyFocus to visualFocus
This is a bit more flexible, because the name is not strictly coupled
with key focus. We can even add a (re)setter later if we want. This
change only renames the property.
Change-Id: I6707e44040f584480a8712df1af0915ae2829d57
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/CheckIndicator.qml')
-rw-r--r-- | src/imports/controls/CheckIndicator.qml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/controls/CheckIndicator.qml b/src/imports/controls/CheckIndicator.qml index fbaf86af..5f75181e 100644 --- a/src/imports/controls/CheckIndicator.qml +++ b/src/imports/controls/CheckIndicator.qml @@ -44,14 +44,14 @@ Rectangle { implicitWidth: 28 implicitHeight: 28 - 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" + color: control.enabled ? (control.down ? (control.visualFocus ? "#cce0ff" : "#e4e4e4") : "#f6f6f6") : "#353637" + border.width: control.visualFocus ? 2 : 1 + border.color: control.enabled ? (control.visualFocus ? "#0066ff" : (control.down ? "#26282a" : "#353637")) : "transparent" Image { x: (parent.width - width) / 2 y: (parent.height - height) / 2 - source: "image://default/check/" + (control.activeKeyFocus ? "#0066ff" : "#353637") + source: "image://default/check/" + (control.visualFocus ? "#0066ff" : "#353637") visible: control.checkState === Qt.Checked } @@ -60,7 +60,7 @@ Rectangle { y: (parent.height - height) / 2 width: 16 height: 3 - color: control.activeKeyFocus ? "#0066ff" : "#353637" + color: control.visualFocus ? "#0066ff" : "#353637" visible: control.checkState === Qt.PartiallyChecked } } |