diff options
| author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2016-03-22 12:23:47 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2016-03-23 11:54:40 +0000 |
| commit | 292550c310a977a9e5da2f14773a07e4dcddce0d (patch) | |
| tree | ba3543accd742760c44e14f657a05ce301663ab2 /src | |
| parent | 13e6379aad532fc89a1beeef15c0d9de38e90f99 (diff) | |
Update Default style CheckBox to match new design specs
Change-Id: Ic828f82d38da4a16dc3d308cb67d94a11582768c
Task-number: QTBUG-50993
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/controls/CheckBox.qml | 9 | ||||
| -rw-r--r-- | src/imports/controls/images/check-focus.png | bin | 0 -> 1252 bytes | |||
| -rw-r--r-- | src/imports/controls/images/check-focus@2x.png | bin | 0 -> 1632 bytes | |||
| -rw-r--r-- | src/imports/controls/images/check-focus@3x.png | bin | 0 -> 1976 bytes | |||
| -rw-r--r-- | src/imports/controls/images/check-focus@4x.png | bin | 0 -> 2334 bytes | |||
| -rw-r--r-- | src/imports/controls/qtquickcontrolsplugin.qrc | 4 |
6 files changed, 9 insertions, 4 deletions
diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml index 52061681..b12374f0 100644 --- a/src/imports/controls/CheckBox.qml +++ b/src/imports/controls/CheckBox.qml @@ -58,13 +58,14 @@ T.CheckBox { x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 - color: control.enabled ? (control.pressed ? "#e4e4e4" : "#f6f6f6") : "#353637" - border.color: control.enabled ? (control.pressed ? "#26282a" : "#353637") : "transparent" + color: control.enabled ? (control.pressed ? (control.activeFocus ? "#cce0ff" : "#e4e4e4") : "#f6f6f6") : "#353637" + border.width: control.activeFocus ? 2 : 1 + border.color: control.enabled ? (control.activeFocus ? "#0066ff" : (control.pressed ? "#26282a" : "#353637")) : "transparent" Image { x: (parent.width - width) / 2 y: (parent.height - height) / 2 - source: "qrc:/qt-project.org/imports/Qt/labs/controls/images/check.png" + source: "qrc:/qt-project.org/imports/Qt/labs/controls/images/check" + (control.activeFocus ? "-focus.png" : ".png") visible: control.checkState === Qt.Checked } @@ -73,7 +74,7 @@ T.CheckBox { y: (parent.height - height) / 2 width: 16 height: 3 - color: "#353637" + color: control.activeFocus ? "#0066ff" : "#353637" visible: control.checkState === Qt.PartiallyChecked } } diff --git a/src/imports/controls/images/check-focus.png b/src/imports/controls/images/check-focus.png Binary files differnew file mode 100644 index 00000000..335373a9 --- /dev/null +++ b/src/imports/controls/images/check-focus.png diff --git a/src/imports/controls/images/check-focus@2x.png b/src/imports/controls/images/check-focus@2x.png Binary files differnew file mode 100644 index 00000000..66b32d16 --- /dev/null +++ b/src/imports/controls/images/check-focus@2x.png diff --git a/src/imports/controls/images/check-focus@3x.png b/src/imports/controls/images/check-focus@3x.png Binary files differnew file mode 100644 index 00000000..298b874c --- /dev/null +++ b/src/imports/controls/images/check-focus@3x.png diff --git a/src/imports/controls/images/check-focus@4x.png b/src/imports/controls/images/check-focus@4x.png Binary files differnew file mode 100644 index 00000000..0106ee8f --- /dev/null +++ b/src/imports/controls/images/check-focus@4x.png diff --git a/src/imports/controls/qtquickcontrolsplugin.qrc b/src/imports/controls/qtquickcontrolsplugin.qrc index 1147ae3d..227bd435 100644 --- a/src/imports/controls/qtquickcontrolsplugin.qrc +++ b/src/imports/controls/qtquickcontrolsplugin.qrc @@ -12,5 +12,9 @@ <file>images/drop-indicator@2x.png</file> <file>images/drop-indicator@3x.png</file> <file>images/drop-indicator@4x.png</file> + <file>images/check-focus.png</file> + <file>images/check-focus@2x.png</file> + <file>images/check-focus@3x.png</file> + <file>images/check-focus@4x.png</file> </qresource> </RCC> |
