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/RadioButton.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/RadioButton.qml')
| -rw-r--r-- | src/imports/controls/RadioButton.qml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml index 8a916270..af6cc1fc 100644 --- a/src/imports/controls/RadioButton.qml +++ b/src/imports/controls/RadioButton.qml @@ -43,7 +43,7 @@ AbstractRadioButton { implicitWidth: Math.max(background ? background.implicitWidth : 0, (label ? label.implicitWidth : 0) + (indicator ? indicator.implicitWidth : 0) + - (label && indicator ? style.spacing : 0) + leftPadding + rightPadding) + (label && indicator ? Style.spacing : 0) + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, Math.max(label ? label.implicitHeight : 0, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) @@ -53,7 +53,7 @@ AbstractRadioButton { Accessible.pressed: pressed Accessible.role: Accessible.RadioButton - padding: style.padding + padding: Style.padding indicator: Rectangle { readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft @@ -65,9 +65,9 @@ AbstractRadioButton { radius: width / 2 border.width: control.activeFocus ? 2 : 1 - border.color: control.activeFocus ? style.focusColor : style.frameColor - opacity: enabled ? 1.0 : style.disabledOpacity - color: style.backgroundColor + border.color: control.activeFocus ? control.Style.focusColor : control.Style.frameColor + opacity: enabled ? 1.0 : control.Style.disabledOpacity + color: control.Style.backgroundColor Rectangle { x: (parent.width - width) / 2 @@ -75,27 +75,27 @@ AbstractRadioButton { width: 12 height: 12 radius: width / 2 - color: Qt.tint(Qt.tint(control.checked ? style.accentColor : style.baseColor, - control.checked && control.activeFocus ? style.focusColor : "transparent"), - control.pressed ? style.pressColor : "transparent") + color: Qt.tint(Qt.tint(control.checked ? control.Style.accentColor : control.Style.baseColor, + control.checked && control.activeFocus ? control.Style.focusColor : "transparent"), + control.pressed ? control.Style.pressColor : "transparent") border.width: control.checked || control.pressed ? 0 : 1 - border.color: style.frameColor + border.color: control.Style.frameColor } } label: Text { readonly property bool mirror: control.effectiveLayoutDirection == Qt.RightToLeft - x: mirror ? control.leftPadding : (indicator.x + indicator.width + control.style.spacing) + x: mirror ? control.leftPadding : (indicator.x + indicator.width + control.Style.spacing) y: control.topPadding - width: parent.width - indicator.width - control.style.spacing - control.leftPadding - control.rightPadding + width: parent.width - indicator.width - control.Style.spacing - control.leftPadding - control.rightPadding height: parent.height - control.topPadding - control.bottomPadding text: control.text - color: control.style.textColor + color: control.Style.textColor elide: Text.ElideRight visible: control.text - opacity: enabled ? 1.0 : control.style.disabledOpacity + opacity: enabled ? 1.0 : control.Style.disabledOpacity horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } |