diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-05 20:39:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-05 20:39:42 +0200 |
| commit | 850f5868b7eef9746c49570ed4c8bfb2c5177ecc (patch) | |
| tree | 91de4ddc14c65e946b2a87b33a5596a95d4c89ec /src/imports/controls/Button.qml | |
| parent | eb1b76053f2c6f35f8a33bec71536ca24651a711 (diff) | |
| parent | 0bd5c342013bfae63f1a7e13a0f531cb0a2c8581 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I59e9e2044184f96f1e66577f6f639d028a825b9e
Diffstat (limited to 'src/imports/controls/Button.qml')
| -rw-r--r-- | src/imports/controls/Button.qml | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index 9562c904..7039dfc9 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,18 +67,16 @@ 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 : Default.focusColor) : (control.down ? Default.buttonCheckedPressedColor : Default.textColor)) : - (control.visualFocus ? (control.down ? Default.focusPressedColor : Default.focusLightColor) : (control.down ? Default.buttonPressedColor : Default.buttonColor)) - border.color: Default.focusColor + 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 } } |