diff options
| author | Jan Arve Saether <jan-arve.saether@digia.com> | 2013-05-13 17:19:34 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-16 07:57:45 +0200 |
| commit | caaeec4755f07c0b12afce7340324d049a3d1d3d (patch) | |
| tree | ecf6e1fc9e293d68be2abed183a5ad2d5af35f19 /src/controls/SplitView.qml | |
| parent | ec2d1831014e323c1f7750833dcc785d18f46456 (diff) | |
| download | qtquickcontrols-caaeec4755f07c0b12afce7340324d049a3d1d3d.tar.gz | |
Revert "Revert "Remove unneeded checks for -1 (infinity) in SplitView""
This reverts commit a454ff7f445f50f86e947d9a7e528f36ca0e3c5e.
This patch should follow patch 91fc9b1823c0a95190005f3baaa4aa227
Change-Id: I5e26da1d967f8880d73e32ad5a76c59bedf7a065
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/controls/SplitView.qml')
| -rw-r--r-- | src/controls/SplitView.qml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/controls/SplitView.qml b/src/controls/SplitView.qml index 0c50bc3b..fc43874e 100644 --- a/src/controls/SplitView.qml +++ b/src/controls/SplitView.qml @@ -231,9 +231,9 @@ Item { function clampedMinMax(value, minimum, maximum) { - if (minimum !== -1 && value < minimum) + if (value < minimum) value = minimum - if (maximum !== -1 && value > maximum) + if (value > maximum) value = maximum return value } @@ -286,8 +286,7 @@ Item { var fillItem = __items[fillIndex] var superfluous = root[d.size] - d.accumulatedSize(0, __items.length, false) var s = Math.max(superfluous, fillItem.Layout[minimum]) - if (fillItem.Layout[maximum] !== -1) - s = Math.min(s, fillItem.Layout[maximum]) + s = Math.min(s, fillItem.Layout[maximum]) fillItem[d.size] = s } |