diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-26 09:51:56 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-26 12:37:00 +0000 |
| commit | 7b165203783efb4d59f0d68f14e8a211fef14d87 (patch) | |
| tree | 38d64e2ab0d8efac20c5c852f262355bbe4e9e1d /src/imports/controls/Button.qml | |
| parent | a98b02635aee2317b9e1f2b93ed8c7f96243b237 (diff) | |
Default: replace remaining Default.focusColor with palette.highlight
Task-number: QTBUG-63369
Change-Id: I37c1f4298fa01b907dfcb28757cd5d7ded182192
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/Button.qml')
| -rw-r--r-- | src/imports/controls/Button.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index 07f066b3..1dbcd3ed 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -77,9 +77,9 @@ T.Button { implicitHeight: 40 visible: !control.flat || control.down || control.checked || control.highlighted color: control.checked || control.highlighted ? - (control.visualFocus ? (control.down ? Default.buttonCheckedFocusColor : Default.focusColor) : (control.down ? Default.buttonCheckedPressedColor : Default.textColor)) : + (control.visualFocus ? (control.down ? Default.buttonCheckedFocusColor : control.palette.highlight) : (control.down ? Default.buttonCheckedPressedColor : Default.textColor)) : (control.visualFocus ? (control.down ? Default.focusPressedColor : Default.focusLightColor) : (control.down ? Default.buttonPressedColor : Default.buttonColor)) - border.color: Default.focusColor + border.color: control.palette.highlight border.width: control.visualFocus ? 2 : 0 } } |