diff options
| author | Nikita Krupenko <krnekit@gmail.com> | 2016-05-09 21:27:51 +0300 |
|---|---|---|
| committer | Nikita Krupenko <krnekit@gmail.com> | 2016-05-10 11:56:01 +0000 |
| commit | a41bc57eec441d8081aaf78e13beb0868f243f1a (patch) | |
| tree | 52572e0d0cb6b943a2e6cc53907136001a5f8f94 /src | |
| parent | 064a7ac884aa47cb3f679c703873305b5817ade3 (diff) | |
Material: correct check indicator size
In design guidelines it is 18x18.
Change-Id: I922d96f3208475d2a248659ec384af510058186f
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/controls/material/CheckBox.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/material/CheckDelegate.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/material/CheckIndicator.qml | 8 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/imports/controls/material/CheckBox.qml b/src/imports/controls/material/CheckBox.qml index a93a1bb1..d2e58347 100644 --- a/src/imports/controls/material/CheckBox.qml +++ b/src/imports/controls/material/CheckBox.qml @@ -50,10 +50,10 @@ T.CheckBox { baselineOffset: contentItem.y + contentItem.baselineOffset spacing: 8 - topPadding: 14 + topPadding: 15 leftPadding: 8 rightPadding: 8 - bottomPadding: 14 + bottomPadding: 15 //! [indicator] indicator: CheckIndicator { diff --git a/src/imports/controls/material/CheckDelegate.qml b/src/imports/controls/material/CheckDelegate.qml index e3143a2b..549a9577 100644 --- a/src/imports/controls/material/CheckDelegate.qml +++ b/src/imports/controls/material/CheckDelegate.qml @@ -50,6 +50,8 @@ T.CheckDelegate { baselineOffset: contentItem.y + contentItem.baselineOffset padding: 16 + topPadding: 14 + bottomPadding: 14 spacing: 16 //! [indicator] diff --git a/src/imports/controls/material/CheckIndicator.qml b/src/imports/controls/material/CheckIndicator.qml index 9f3a55ef..c541e221 100644 --- a/src/imports/controls/material/CheckIndicator.qml +++ b/src/imports/controls/material/CheckIndicator.qml @@ -39,8 +39,8 @@ import QtQuick.Controls.Material 2.0 Rectangle { id: indicatorItem - implicitWidth: 20 - implicitHeight: 20 + implicitWidth: 18 + implicitHeight: 18 color: "transparent" border.color: control.checked ? control.Material.accentColor : control.Material.secondaryTextColor border.width: control.checked ? width / 2 : 2 @@ -76,8 +76,8 @@ Rectangle { id: checkImage x: (parent.width - width) / 2 y: (parent.height - height) / 2 - width: 16 - height: 16 + width: 14 + height: 14 source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Material/images/check.png" fillMode: Image.PreserveAspectFit |