diff options
| author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-11-13 10:22:41 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-11-19 17:49:45 +0000 |
| commit | 6ca831b18f361924cab39b65d1a1e8b31e60b3fc (patch) | |
| tree | 37fce3bddfc8f48fa3ba503174fdcb8c4df5a359 /src/imports/controls/Button.qml | |
| parent | f507472c306f13f4cc965ffd9f56f8e436b0e04b (diff) | |
Adjust default style to match current specs.
There are still more changes to come.
Change-Id: I94ed2c5d649d72d90e43120841c2457091200b59
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/Button.qml')
| -rw-r--r-- | src/imports/controls/Button.qml | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index 82fe82b4..cd725298 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.Button { @@ -56,10 +55,9 @@ T.Button { y: control.topPadding width: control.availableWidth height: control.availableHeight - text: control.text font: control.font - color: control.Theme.selectedTextColor + color: control.highlighted ? "#ffffff" : (control.pressed ? "#26282a" : "#353637") horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter elide: Text.ElideRight @@ -68,14 +66,10 @@ T.Button { //! [background] background: Rectangle { - implicitWidth: 36 - implicitHeight: 36 - - radius: 3 - color: Qt.darker(Qt.tint(!control.enabled ? control.Theme.disabledColor : - control.activeFocus ? control.Theme.focusColor : control.Theme.accentColor, - control.pressed ? control.Theme.pressColor : "transparent"), - control.checkable && control.checked ? 1.5 : 1.0) + implicitWidth: 100 + implicitHeight: 40 + color: control.pressed ? (control.highlighted ? "#585a5c" : "#bdbebf") : (control.highlighted ? "#353637" : "#ffffff") + border.color: control.pressed ? "#26282a" : "#353637" } //! [background] } |