diff options
| author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2013-03-21 11:44:54 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-21 13:52:01 +0100 |
| commit | 9087e420661c197b82be7025cd5e81c217ce9d16 (patch) | |
| tree | e75c9ca73db7de78477886ad78fed74a19bc6b0d /src/controls/GroupBox.qml | |
| parent | 3af5b889c36b1719d4131b771cf8ffd714dd1d10 (diff) | |
Size adjustment for GroupBox
Change-Id: Icb1dece74c8fde915d7012c2ec5627c1a791b3bd
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/controls/GroupBox.qml')
| -rw-r--r-- | src/controls/GroupBox.qml | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/controls/GroupBox.qml b/src/controls/GroupBox.qml index 16c40d922..b97ee18b4 100644 --- a/src/controls/GroupBox.qml +++ b/src/controls/GroupBox.qml @@ -40,6 +40,7 @@ import QtQuick 2.1 import QtQuick.Controls 1.0 +import QtQuick.Controls.Styles 1.0 import "Styles/Settings.js" as Settings /*! @@ -129,12 +130,15 @@ Item { /*! This property holds the width of the content. */ - readonly property real contentWidth: content.childrenRect.width + readonly property real contentWidth: content.childrenRect.width + 2 * __margin /*! This property holds the height of the content. */ - readonly property real contentHeight: content.childrenRect.height + readonly property real contentHeight: content.childrenRect.height + 2 * __margin + + /*! \internal */ + property int __margin: 8 /*! \internal */ property Component style: Qt.createComponent(Settings.THEME_PATH + "/GroupBoxStyle.qml", groupbox) @@ -145,8 +149,8 @@ Item { /*! \internal */ property alias __checkbox: check - implicitWidth: Math.max(200, contentWidth + (loader.item ? loader.item.implicitWidth: 0) ) - implicitHeight: contentHeight + (loader.item ? loader.item.implicitHeight : 0) + 4 + implicitWidth: Math.max(200, (loader.item ? loader.item.implicitWidth: 0) ) + implicitHeight: (loader.item ? loader.item.implicitHeight : 0) Accessible.role: Accessible.Grouping Accessible.name: title @@ -157,7 +161,7 @@ Item { id: loader property alias control: groupbox anchors.fill: parent - property int topMargin: title.length > 0 || checkable ? 22 : 4 + property int topMargin: (title.length > 0 || checkable ? 16 : 0) + __margin property int bottomMargin: 4 property int leftMargin: 4 property int rightMargin: 4 @@ -174,6 +178,7 @@ Item { anchors.left: parent.left anchors.right: parent.right height: loader.topMargin + style: CheckBoxStyle { panel: Item{} } } Item { @@ -181,9 +186,9 @@ Item { z: 1 focus: true anchors.topMargin: loader.topMargin - anchors.leftMargin: 8 - anchors.rightMargin: 8 - anchors.bottomMargin: 8 + anchors.leftMargin: __margin + anchors.rightMargin: __margin + anchors.bottomMargin: __margin anchors.fill: parent enabled: (!groupbox.checkable || groupbox.checked) } |