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/RadioButton.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/RadioButton.qml')
-rw-r--r-- | src/imports/controls/RadioButton.qml | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml index 0c4d0edd..83a8359e 100644 --- a/src/imports/controls/RadioButton.qml +++ b/src/imports/controls/RadioButton.qml @@ -54,28 +54,24 @@ T.RadioButton { //! [indicator] indicator: Rectangle { - implicitWidth: 20 - implicitHeight: 20 + implicitWidth: 28 + implicitHeight: 28 x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 radius: width / 2 - border.width: control.activeFocus ? 2 : 1 - border.color: control.activeFocus ? control.Theme.focusColor : control.Theme.frameColor - color: control.Theme.backgroundColor + border.width: 1 + border.color: control.pressed ? "#26282a" : control.enabled && control.checked ? "#353637" : "#bdbebf" + color: control.pressed ? "#bdbebf" : "#ffffff" Rectangle { x: (parent.width - width) / 2 y: (parent.height - height) / 2 - width: 12 - height: 12 + width: 20 + height: 20 radius: width / 2 - color: Qt.tint(control.checked && !control.enabled ? control.Theme.disabledColor : - control.checked && control.activeFocus ? control.Theme.focusColor : - control.checked ? control.Theme.accentColor : control.Theme.baseColor, - control.pressed ? control.Theme.pressColor : "transparent") - border.width: control.checked || control.pressed ? 0 : 1 - border.color: control.Theme.frameColor + color: control.enabled ? "#353637" : "#bdbebf" + visible: control.checked } } //! [indicator] |