diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-04-11 12:46:55 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-04-11 13:04:45 +0000 |
| commit | e7b42b4de0d9148e53a245ffd4eb26338fd9f8dc (patch) | |
| tree | 07b0ce7fc52ff61ee9dbdff1f45456ebe2875eca /src/imports/controls/universal | |
| parent | 8fd632c65e215925fed12e3b21ab98b77382e3ab (diff) | |
Use Control.activeKeyFocus instead of Item.activeFocus
This makes the controls visualize focus only when interacting with
keys, so this basically allows us to set for example Qt.StrongFocus
policy by default on buttons and friends.
Change-Id: I6c81c58b7acfd2bc592bdd12d804e7e48ee65e95
Task-number: QTBUG-51796
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/universal')
| -rw-r--r-- | src/imports/controls/universal/ComboBox.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/ItemDelegate.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/universal/MenuItem.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/SwipeDelegate.qml | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml index 9c38ab8d..f1767828 100644 --- a/src/imports/controls/universal/ComboBox.qml +++ b/src/imports/controls/universal/ComboBox.qml @@ -93,7 +93,7 @@ T.ComboBox { width: parent.width - 4 height: parent.height - 4 - visible: control.activeFocus && (control.focusReason === Qt.TabFocusReason || control.focusReason === Qt.BacktabFocusReason) + visible: control.activeKeyFocus color: control.Universal.accent opacity: control.Universal.theme === Universal.Light ? 0.4 : 0.6 } diff --git a/src/imports/controls/universal/ItemDelegate.qml b/src/imports/controls/universal/ItemDelegate.qml index 3296a7cd..d381086d 100644 --- a/src/imports/controls/universal/ItemDelegate.qml +++ b/src/imports/controls/universal/ItemDelegate.qml @@ -83,12 +83,12 @@ T.ItemDelegate { //! [background] background: Rectangle { - visible: control.pressed || control.highlighted || control.activeFocus + visible: control.pressed || control.highlighted || control.activeKeyFocus color: control.pressed ? 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/MenuItem.qml b/src/imports/controls/universal/MenuItem.qml index cc8cb75d..128ef9da 100644 --- a/src/imports/controls/universal/MenuItem.qml +++ b/src/imports/controls/universal/MenuItem.qml @@ -92,7 +92,7 @@ T.MenuItem { width: parent.width - 2 height: parent.height - 2 - visible: control.activeFocus + visible: control.activeKeyFocus color: control.Universal.accent opacity: control.Universal.theme === Universal.Light ? 0.4 : 0.6 } diff --git a/src/imports/controls/universal/SwipeDelegate.qml b/src/imports/controls/universal/SwipeDelegate.qml index 92c3a6dc..7041e18e 100644 --- a/src/imports/controls/universal/SwipeDelegate.qml +++ b/src/imports/controls/universal/SwipeDelegate.qml @@ -94,12 +94,12 @@ T.SwipeDelegate { background: Rectangle { color: !control.enabled ? control.Universal.chromeDisabledHighColor : (control.pressed ? control.Universal.chromeHighColor : - (control.activeFocus || control.hovered ? control.Universal.chromeLowColor : control.Universal.chromeMediumColor)) + (control.activeKeyFocus || control.hovered ? control.Universal.chromeLowColor : control.Universal.chromeMediumColor)) 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 } |