diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-09 12:59:41 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-09 14:18:27 +0000 |
| commit | 6322aed4bef09a07cc5b86a343144ab249509704 (patch) | |
| tree | a74697fde71d4f0366aad86bd950be9318d6d647 | |
| parent | 0f2f0f87b8346480fcc605712b70269fafe07ac5 (diff) | |
Containers: increase padding
6px is a very small default padding on high DPI. This
is well visible in the Gallery example, for instance.
All the control introduction labels are very near the
screen edges.
Change-Id: I4b998ada4589b04bc1015d1873a7031c15d89938
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| -rw-r--r-- | src/imports/controls/Frame.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/GroupBox.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/Pane.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/material/Frame.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/material/GroupBox.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/material/Pane.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/GroupBox.qml | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/src/imports/controls/Frame.qml b/src/imports/controls/Frame.qml index 1f1bfac6..581d15c8 100644 --- a/src/imports/controls/Frame.qml +++ b/src/imports/controls/Frame.qml @@ -46,7 +46,7 @@ T.Frame { contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) - padding: 6 + padding: 12 //! [contentItem] contentItem: Item { } diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml index 7ae14c24..3de866a9 100644 --- a/src/imports/controls/GroupBox.qml +++ b/src/imports/controls/GroupBox.qml @@ -49,8 +49,8 @@ T.GroupBox { contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) spacing: 6 - padding: 6 - topPadding: 6 + (label && label.implicitWidth > 0 ? label.implicitHeight + spacing : 0) + padding: 12 + topPadding: padding + (label && label.implicitWidth > 0 ? label.implicitHeight + spacing : 0) //! [contentItem] contentItem: Item { } diff --git a/src/imports/controls/Pane.qml b/src/imports/controls/Pane.qml index 7b95cd8a..7fbdb492 100644 --- a/src/imports/controls/Pane.qml +++ b/src/imports/controls/Pane.qml @@ -46,7 +46,7 @@ T.Pane { contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) - padding: 6 + padding: 12 //! [contentItem] contentItem: Item { } diff --git a/src/imports/controls/material/Frame.qml b/src/imports/controls/material/Frame.qml index 4c21e40b..87e30a18 100644 --- a/src/imports/controls/material/Frame.qml +++ b/src/imports/controls/material/Frame.qml @@ -47,7 +47,7 @@ T.Frame { contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) - padding: 6 + padding: 12 //! [contentItem] contentItem: Item { } diff --git a/src/imports/controls/material/GroupBox.qml b/src/imports/controls/material/GroupBox.qml index ef54ea7c..21a3a88d 100644 --- a/src/imports/controls/material/GroupBox.qml +++ b/src/imports/controls/material/GroupBox.qml @@ -50,8 +50,8 @@ T.GroupBox { contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) spacing: 6 - padding: 6 - topPadding: 6 + (label && label.implicitWidth > 0 ? label.implicitHeight + spacing : 0) + padding: 12 + topPadding: padding + (label && label.implicitWidth > 0 ? label.implicitHeight + spacing : 0) //! [contentItem] contentItem: Item {} diff --git a/src/imports/controls/material/Pane.qml b/src/imports/controls/material/Pane.qml index b936f08f..20542b61 100644 --- a/src/imports/controls/material/Pane.qml +++ b/src/imports/controls/material/Pane.qml @@ -47,7 +47,7 @@ T.Pane { contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) - padding: 6 + padding: 12 //! [contentItem] contentItem: Item { } diff --git a/src/imports/controls/universal/GroupBox.qml b/src/imports/controls/universal/GroupBox.qml index 2b8ae935..9d80f1ac 100644 --- a/src/imports/controls/universal/GroupBox.qml +++ b/src/imports/controls/universal/GroupBox.qml @@ -51,7 +51,7 @@ T.GroupBox { spacing: 12 padding: 12 - topPadding: 12 + (label && label.implicitWidth > 0 ? label.implicitHeight + spacing : 0) + topPadding: padding + (label && label.implicitWidth > 0 ? label.implicitHeight + spacing : 0) //! [contentItem] contentItem: Item { } |