diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2016-05-13 13:40:54 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2016-05-13 11:45:32 +0000 |
| commit | 4733004cac1e9def9b1fd37010580dd07607c05c (patch) | |
| tree | cdc4551a1574bebbe38db87d21a7c026f87b9b2b /src/imports/controls/Button.qml | |
| parent | 73f5c10ccae8554c063a201402ebd956a2db9c48 (diff) | |
Default style: make Button's colors more consistent
Change-Id: I35dcd5b1ef7564cfd3da8b1fb15dbfecd1050749
Task-number: QTBUG-53350
Reviewed-by: J-P Nurmi <jpnurmi@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 d9ca2910..45203a36 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -54,7 +54,7 @@ T.Button { contentItem: Text { text: control.text font: control.font - opacity: enabled || highlighted ? 1 : 0.3 + opacity: enabled || control.highlighted || control.checked ? 1 : 0.3 color: control.checked || control.highlighted ? "#ffffff" : (control.visualFocus ? "#0066ff" : (control.down ? "#26282a" : "#353637")) horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter @@ -66,7 +66,7 @@ T.Button { background: Rectangle { implicitWidth: 100 implicitHeight: 40 - opacity: enabled ? 1 : (control.checked ? 0.2 : 0.3) + opacity: enabled ? 1 : 0.3 color: control.checked || control.highlighted ? (control.visualFocus ? (control.down ? "#599bff" : "#0066ff") : (control.down ? "#585a5c" : "#353637")) : (control.visualFocus ? (control.down ? "#cce0ff" : "#f0f6ff") : (control.down ? "#d6d6d6" : "#f6f6f6")) |