diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-03-06 11:52:10 +0100 |
|---|---|---|
| committer | Jari-Pekka Nurmi <jpnurmi@theqtcompany.com> | 2015-03-11 01:06:44 +0200 |
| commit | a3921bcf01275425350c9c153fe92086a34d1403 (patch) | |
| tree | 1c5c4dd36e9d19a36281bde723c7bf989bc70298 /src/imports/controls/Button.qml | |
| parent | e9398b7465c7df38876d0c6528ea5c42bbd8bf6a (diff) | |
Implement Style as an attached property
Change-Id: I006ee566647e31d1a14919d164d7dd68539aae10
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/Button.qml')
| -rw-r--r-- | src/imports/controls/Button.qml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index 9780b6b1..e78aa731 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -49,7 +49,7 @@ AbstractButton { Accessible.pressed: pressed Accessible.role: Accessible.Button - padding: style.padding + padding: Style.padding label: Text { x: control.leftPadding @@ -58,9 +58,9 @@ AbstractButton { height: parent.height - control.topPadding - control.bottomPadding text: control.text - color: control.style.selectedTextColor + color: control.Style.selectedTextColor elide: Text.ElideRight - opacity: enabled ? 1.0 : control.style.disabledOpacity + opacity: enabled ? 1.0 : control.Style.disabledOpacity horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } @@ -69,10 +69,10 @@ AbstractButton { implicitWidth: 26 implicitHeight: 26 - radius: style.roundness - opacity: control.enabled ? 1.0 : style.disabledOpacity - color: Qt.tint(Qt.tint(style.accentColor, - control.activeFocus ? style.focusColor : "transparent"), - control.pressed ? style.pressColor : "transparent") + radius: control.Style.roundness + opacity: control.enabled ? 1.0 : control.Style.disabledOpacity + color: Qt.tint(Qt.tint(control.Style.accentColor, + control.activeFocus ? control.Style.focusColor : "transparent"), + control.pressed ? control.Style.pressColor : "transparent") } } |