diff options
author | Jan Arve Saether <jan-arve.saether@digia.com> | 2013-04-18 15:15:25 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-18 16:17:16 +0200 |
commit | 70acaf3d676c85f0b2e6f9343c4160937c4e9810 (patch) | |
tree | 8db6320881bc9be114609f1a3121d12fd4f805e0 /src/controls/SplitView.qml | |
parent | 7c5467f835d2781159e237d14828d5d350595efe (diff) |
Do not clamp to Layout.maximum{Width,Height} if its -1
This regressed due to 2ed163c6c6cb85b946b4166b3136d43336ff7adf
Change-Id: Ib566dec33dad2f5dad5894ff94bd5ce09ecd515a
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/controls/SplitView.qml')
-rw-r--r-- | src/controls/SplitView.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/SplitView.qml b/src/controls/SplitView.qml index 36788c326..2c64e4194 100644 --- a/src/controls/SplitView.qml +++ b/src/controls/SplitView.qml @@ -241,7 +241,7 @@ Item { if (i !== d.expandingIndex) { var item = __items[i]; if (item.Layout[maximum] !== undefined) { - if (item[d.size] > item.Layout[maximum]) + if (item.Layout[maximum] >= 0 && item[d.size] > item.Layout[maximum]) item[d.size] = item.Layout[maximum] } if (item.Layout[minimum] !== undefined) { |