diff options
| author | Jan Arve Saether <jan-arve.saether@digia.com> | 2013-05-08 16:42:27 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-09 10:42:25 +0200 |
| commit | ee5dd2add584954a6d7415a380fcd68640f675a5 (patch) | |
| tree | 2219ed512482a4569e542906d4234d7fd210ac6a /examples | |
| parent | a0165b6322581c1b7735366c0943d17e91990f8f (diff) | |
| download | qtquickcontrols-ee5dd2add584954a6d7415a380fcd68640f675a5.tar.gz | |
Fix basiclayouts example so that the window can be smaller..
..than the implicit size of the layout.
Change-Id: I89ad1d91c7e492ba498acd50e2ddde9cc8e84581
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quick/controls/basiclayouts/main.qml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/examples/quick/controls/basiclayouts/main.qml b/examples/quick/controls/basiclayouts/main.qml index 7b83a2e0..6ce18fef 100644 --- a/examples/quick/controls/basiclayouts/main.qml +++ b/examples/quick/controls/basiclayouts/main.qml @@ -49,10 +49,12 @@ import QtQuick.Layouts 1.0 ApplicationWindow { title: "Basic layouts" property int margin: 11 - minimumWidth: mainLayout.implicitWidth + 2 * margin - minimumHeight: mainLayout.implicitHeight + 2 * margin - width: minimumWidth - height: minimumHeight + width: mainLayout.implicitWidth + 2 * margin + height: mainLayout.implicitHeight + 2 * margin + minimumWidth: mainLayout.Layout.minimumWidth + 2 * margin + minimumHeight: mainLayout.Layout.minimumHeight + 2 * margin + maximumWidth: mainLayout.Layout.maximumWidth + 2 * margin + maximumHeight: mainLayout.Layout.maximumHeight + 2 * margin ColumnLayout { id: mainLayout @@ -111,8 +113,8 @@ ApplicationWindow { TextArea { id: t3 text: "This fills the whole cell" - Layout.preferredWidth: 200 - Layout.preferredHeight: 400 + Layout.minimumHeight: 30 + Layout.maximumHeight: 300 Layout.fillHeight: true Layout.fillWidth: true } |