diff options
author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2016-05-02 11:23:32 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2016-05-04 12:18:13 +0000 |
commit | 76602f94e6a495ed44f05d9152e4044acf19661b (patch) | |
tree | c9a7820767cbec162ead96f8e1e89bcf09458267 /src | |
parent | ff9d924d98aac8248ce99aef992920aeb99fda7e (diff) |
Default style: fix focus visuals for remaining controls
Change-Id: I063a9fbb29b66fa3a11112482c5d263bcc9bdbad
Task-number: QTBUG-50993
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/controls/RadioIndicator.qml | 2 | ||||
-rw-r--r-- | src/imports/controls/Slider.qml | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/imports/controls/RadioIndicator.qml b/src/imports/controls/RadioIndicator.qml index 2223cfe2..b9a17dfe 100644 --- a/src/imports/controls/RadioIndicator.qml +++ b/src/imports/controls/RadioIndicator.qml @@ -41,7 +41,7 @@ Rectangle { implicitHeight: 28 radius: width / 2 - color: control.down ? (control.visualFocus ? "#cce0ff" : "#e4e4e4") : "#f6f6f6" + color: control.down ? (control.visualFocus ? "#cce0ff" : "#e4e4e4") : (control.visualFocus ? "#f0f6ff" : "#f6f6f6") border.width: control.visualFocus ? 2 : 1 border.color: control.visualFocus ? "#0066ff" : (control.down ? "#26282a" : "#353637") diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml index a53c99aa..fd83d8e5 100644 --- a/src/imports/controls/Slider.qml +++ b/src/imports/controls/Slider.qml @@ -56,8 +56,9 @@ T.Slider { implicitWidth: 28 implicitHeight: 28 radius: width / 2 - border.color: "#353637" - color: control.pressed ? "#bdbebf" : "#f6f6f6" + color: control.pressed ? (control.visualFocus ? "#cce0ff" : "#e4e4e4") : (control.visualFocus ? "#f0f6ff" : "#f6f6f6") + border.width: control.visualFocus ? 2 : 1 + border.color: control.visualFocus ? "#0066ff" : (control.pressed ? "#26282a" : "#353637") readonly property bool horizontal: control.orientation === Qt.Horizontal } |