diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-27 15:39:56 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-28 13:11:20 +0000 |
| commit | 382262da77637ea776b42c4e359671d7aa2ce8c4 (patch) | |
| tree | f7674ba34d34afb4c6b783bee0cfbf9cb53d9995 | |
| parent | af45776e30c50841ecd756d65635fa6f4f4ef120 (diff) | |
Default: make Button use palettes
Task-number: QTBUG-63369
Change-Id: I54826f9d76a8789ffc36dd2f613648c5553103e0
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/imports/controls/Button.qml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index 1dbcd3ed..a5e86a38 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -56,8 +56,7 @@ T.Button { icon.width: 24 icon.height: 24 icon.color: control.checked || control.highlighted ? control.palette.brightText : - control.visualFocus ? control.palette.highlight : - control.flat && !control.down ? control.palette.windowText : control.palette.buttonText + control.flat && !control.down ? (control.visualFocus ? control.palette.highlight : control.palette.windowText) : control.palette.buttonText contentItem: IconLabel { spacing: control.spacing @@ -68,17 +67,15 @@ T.Button { text: control.text font: control.font color: control.checked || control.highlighted ? control.palette.brightText : - control.visualFocus ? control.palette.highlight : - control.flat && !control.down ? control.palette.windowText : control.palette.buttonText + control.flat && !control.down ? (control.visualFocus ? control.palette.highlight : control.palette.windowText) : control.palette.buttonText } background: Rectangle { implicitWidth: 100 implicitHeight: 40 visible: !control.flat || control.down || control.checked || control.highlighted - color: control.checked || control.highlighted ? - (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)) + color: Color.blend(control.checked || control.highlighted ? control.palette.dark : control.palette.button, + control.palette.mid, control.down ? 0.5 : 0.0) border.color: control.palette.highlight border.width: control.visualFocus ? 2 : 0 } |