diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-04-08 18:16:13 +0200 |
|---|---|---|
| committer | Jari-Pekka Nurmi <jpnurmi@theqtcompany.com> | 2015-04-08 19:18:02 +0300 |
| commit | 7b971c28e6098b629b8e9e3e38a9465a3f1bd459 (patch) | |
| tree | c5c475894671c0cc7e38d59287d3c2d6ba46128b /src/imports/controls/Button.qml | |
| parent | 1c0edf002a50a765a66349d733cf170f4a4024ef (diff) | |
Rename Style to Theme
Change-Id: I0186cd36f0b42ca015b70a09af27f8a3517d4a60
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 e78aa731..0dd9b6ee 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: Theme.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.Theme.selectedTextColor elide: Text.ElideRight - opacity: enabled ? 1.0 : control.Style.disabledOpacity + opacity: enabled ? 1.0 : control.Theme.disabledOpacity horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } @@ -69,10 +69,10 @@ AbstractButton { implicitWidth: 26 implicitHeight: 26 - 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") + radius: control.Theme.roundness + opacity: control.enabled ? 1.0 : control.Theme.disabledOpacity + color: Qt.tint(Qt.tint(control.Theme.accentColor, + control.activeFocus ? control.Theme.focusColor : "transparent"), + control.pressed ? control.Theme.pressColor : "transparent") } } |