diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-17 23:08:00 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-18 22:11:24 +0200 |
| commit | d9aae9ff99d20b58487b0a48801864d13115363b (patch) | |
| tree | e98089900164f7a1008e6fb59d1815dc9eab8d2c /src/controls/SplitView.qml | |
| parent | 49bd4b76d08ec11d08105ca71e8dda4f8d459b5c (diff) | |
| parent | c2356328f88b044c8956fe7860c4c04fca4f2c30 (diff) | |
| download | qtquickcontrols-d9aae9ff99d20b58487b0a48801864d13115363b.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/controls/Private/qquickrangemodel.cpp
src/controls/Private/qquickrangemodel_p.h
src/controls/Private/qquickrangemodel_p_p.h
src/layouts/qquicklayout.cpp
tests/auto/controls/data/tst_rangemodel.qml
Change-Id: I9c8f6326c6edf9ebb18dd538f76830e1b439ba8e
Diffstat (limited to 'src/controls/SplitView.qml')
| -rw-r--r-- | src/controls/SplitView.qml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/controls/SplitView.qml b/src/controls/SplitView.qml index 6ad785ba..b95704d3 100644 --- a/src/controls/SplitView.qml +++ b/src/controls/SplitView.qml @@ -61,9 +61,13 @@ import QtQuick.Window 2.1 item will get all leftover space when other items have been laid out. By default, the last visible child of the SplitView will have this set, but it can be changed by explicitly setting fillWidth to \c true on another item. + As the fillWidth item will automatically be resized to fit the extra space, explicit assignments - to width and height will be ignored (but \l{Layout::minimumWidth}{Layout.minimumWidth} and + to its width and height properties will be ignored (but \l{Layout::minimumWidth}{Layout.minimumWidth} and \l{Layout::maximumWidth}{Layout.maximumWidth} will still be respected). + The initial sizes of other items should be set via their width and height properties. + Any binding assignment to an item's width or height will be broken as soon as the user + drags that item's splitter handle. A handle can belong to the item either on the left or top side, or on the right or bottom side: \list |