From 57cb0961f811c90ddf5ed9298935d958e8afcd2a Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Wed, 22 May 2013 15:16:10 +0200 Subject: Update GroupBox to support contentItem - Removed contentWidth and contentHeight since it is not needed - Exposed contentItem so that it can be designable. - Respect the implicit width or height of the contentItem if it is the only item of the GroupBox. Otherwise childrenRect is used. - Modified the style so that the style takes care of only the padding size and not the entire size of the group box. - Fixed flat and checkable appearance for custom style Change-Id: I2c7ec4cb7d5e6f96863847e8d8d6d6f52428364e Reviewed-by: J-P Nurmi --- examples/quick/controls/basiclayouts/main.qml | 4 ---- examples/quick/controls/gallery/content/Controls.qml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'examples') diff --git a/examples/quick/controls/basiclayouts/main.qml b/examples/quick/controls/basiclayouts/main.qml index 74ccb491..e43f0a4a 100644 --- a/examples/quick/controls/basiclayouts/main.qml +++ b/examples/quick/controls/basiclayouts/main.qml @@ -61,8 +61,6 @@ ApplicationWindow { GroupBox { id: rowBox title: "Row layout" - contentWidth: rowLayout.implicitWidth - contentHeight: rowLayout.implicitHeight Layout.fillWidth: true RowLayout { @@ -81,8 +79,6 @@ ApplicationWindow { GroupBox { id: gridBox title: "Grid layout" - contentWidth: gridLayout.implicitWidth - contentHeight: gridLayout.implicitHeight Layout.fillWidth: true GridLayout { diff --git a/examples/quick/controls/gallery/content/Controls.qml b/examples/quick/controls/gallery/content/Controls.qml index 93b933d7..310eee59 100644 --- a/examples/quick/controls/gallery/content/Controls.qml +++ b/examples/quick/controls/gallery/content/Controls.qml @@ -154,8 +154,8 @@ Item { id: group2 title:"Tab Position" width: area.width - ExclusiveGroup { id: tabPositionGroup } Row { + ExclusiveGroup { id: tabPositionGroup } RadioButton { id: r1 text: "Top" -- cgit v1.2.1