diff options
| author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2013-05-22 15:16:10 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-23 14:36:02 +0200 |
| commit | 57cb0961f811c90ddf5ed9298935d958e8afcd2a (patch) | |
| tree | 432b48e624734bc8856676f699b47e55ec473763 /examples/quick/controls/basiclayouts | |
| parent | 587c2c00678f8b3fe9e3249875630112cfb27de7 (diff) | |
| download | qtquickcontrols-57cb0961f811c90ddf5ed9298935d958e8afcd2a.tar.gz | |
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 <jpnurmi@digia.com>
Diffstat (limited to 'examples/quick/controls/basiclayouts')
| -rw-r--r-- | examples/quick/controls/basiclayouts/main.qml | 4 |
1 files changed, 0 insertions, 4 deletions
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 { |