From caaeec4755f07c0b12afce7340324d049a3d1d3d Mon Sep 17 00:00:00 2001
From: Jan Arve Saether <jan-arve.saether@digia.com>
Date: Mon, 13 May 2013 17:19:34 +0200
Subject: [PATCH] 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>
---
src/controls/SplitView.qml | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/controls/SplitView.qml b/src/controls/SplitView.qml
index 0c50bc3bb..fc43874ea 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
}
--
GitLab