diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-05-13 23:39:15 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-05-18 09:26:00 +0000 |
| commit | 08eb526524e92e0d1139cb74e1a7818bcd8d5d6a (patch) | |
| tree | 2ae9ddb0a283f182a3794ac69435e6d25c61ca40 /src/imports/controls/Button.qml | |
| parent | b6ecb5a4d14663dc00d8179f590e86bfd52c6881 (diff) | |
Add support for flat Buttons
Task-number: QTBUG-51054
Change-Id: Ib4b23b624bc34d16c5acc1568881b609d3fd64b8
Reviewed-by: Nikita Krupenko <krnekit@gmail.com>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/Button.qml')
| -rw-r--r-- | src/imports/controls/Button.qml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index 45203a36..b461fdfe 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -67,11 +67,12 @@ T.Button { implicitWidth: 100 implicitHeight: 40 opacity: enabled ? 1 : 0.3 + visible: !control.flat || control.down || control.checked || control.highlighted 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")) border.color: control.visualFocus ? "#0066ff" : (control.down ? "#26282a" : "#353637") - border.width: control.checked || control.highlighted ? 0 : (control.visualFocus ? 2 : 1) + border.width: control.flat || control.checked || control.highlighted ? 0 : (control.visualFocus ? 2 : 1) } //! [background] } |