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/ComboBox.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/ComboBox.qml')
| -rw-r--r-- | src/imports/controls/ComboBox.qml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml index 66d27da4..0ab7bf24 100644 --- a/src/imports/controls/ComboBox.qml +++ b/src/imports/controls/ComboBox.qml @@ -66,7 +66,7 @@ T.ComboBox { contentItem: Text { text: control.displayText font: control.font - color: control.activeKeyFocus ? "#0066ff" : "#353637" + color: control.visualFocus ? "#0066ff" : "#353637" horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter elide: Text.ElideRight @@ -79,22 +79,22 @@ T.ComboBox { implicitWidth: 120 implicitHeight: 40 - color: control.activeKeyFocus ? (control.pressed ? "#cce0ff" : "#f0f6ff") : + color: control.visualFocus ? (control.pressed ? "#cce0ff" : "#f0f6ff") : (control.pressed || popup.visible ? "#d6d6d6" : "#f6f6f6") - border.color: control.activeKeyFocus ? "#0066ff" : "#353637" - border.width: control.activeKeyFocus ? 2 : 1 + border.color: control.visualFocus ? "#0066ff" : "#353637" + border.width: control.visualFocus ? 2 : 1 Image { x: parent.width - width - 4 y: (parent.height - height) / 2 - source: "image://default/double-arrow/" + (control.activeKeyFocus ? "#0066ff" : "#353637") + source: "image://default/double-arrow/" + (control.visualFocus ? "#0066ff" : "#353637") } } //! [background] //! [popup] popup: T.Popup { - y: control.height - (control.activeKeyFocus ? 0 : 1) + y: control.height - (control.visualFocus ? 0 : 1) implicitWidth: control.width implicitHeight: listview.contentHeight topMargin: 6 |