From 8bced38bb27df745c22d0694ae5e8101b07ea69e Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Fri, 28 Sep 2007 14:13:34 +0000
Subject: [PATCH] * Renamed fLayoutValid to fMinMaxValid. * Clear fMinMaxValid
 when a new constraint is added. "Height for width"   constraints are
 therefore no longer ignored.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22343 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kits/interface/layouter/ComplexLayouter.cpp | 10 ++++++----
 src/kits/interface/layouter/ComplexLayouter.h   |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/kits/interface/layouter/ComplexLayouter.cpp b/src/kits/interface/layouter/ComplexLayouter.cpp
index af40a406b2..b99ce6d50f 100644
--- a/src/kits/interface/layouter/ComplexLayouter.cpp
+++ b/src/kits/interface/layouter/ComplexLayouter.cpp
@@ -166,7 +166,7 @@ ComplexLayouter::ComplexLayouter(int32 elementCount, int32 spacing)
 	  fSumBackups(new(nothrow) SumItemBackup[elementCount + 1]),
 	  fOptimizer(new(nothrow) LayoutOptimizer(elementCount)),
 	  fUnlimited(B_SIZE_UNLIMITED / (elementCount == 0 ? 1 : elementCount)),
-	  fLayoutValid(false),
+	  fMinMaxValid(false),
 	  fOptimizerConstraintsAdded(false)
 {
 	if (fConstraints)
@@ -247,6 +247,8 @@ ComplexLayouter::AddConstraints(int32 element, int32 length,
 		constraint->next = *slot;
 		*slot = constraint;
 	}
+
+	fMinMaxValid = false;
 }
 
 
@@ -386,7 +388,7 @@ ComplexLayouter::CloneLayouter()
 		(fElementCount + 1) * sizeof(SumItemBackup));
 	layouter->fMin = fMin;
 	layouter->fMax = fMax;
-	layouter->fLayoutValid = fLayoutValid;
+	layouter->fMinMaxValid = fMinMaxValid;
 
 	return layouterDeleter.Detach();
 }
@@ -577,7 +579,7 @@ ComplexLayouter::_ValidateLayout()
 	// incorporated, the resulting minc[n] and maxc[n] are the min and max
 	// limits we wanted to compute.
 
-	if (fLayoutValid)
+	if (fMinMaxValid)
 		return;
 
 	fSums[0].min = 0;
@@ -656,7 +658,7 @@ ComplexLayouter::_ValidateLayout()
 	}
 
 	fOptimizerConstraintsAdded = false;
-	fLayoutValid = true;
+	fMinMaxValid = true;
 }
 
 
diff --git a/src/kits/interface/layouter/ComplexLayouter.h b/src/kits/interface/layouter/ComplexLayouter.h
index e548762d70..990915e745 100644
--- a/src/kits/interface/layouter/ComplexLayouter.h
+++ b/src/kits/interface/layouter/ComplexLayouter.h
@@ -74,7 +74,7 @@ private:
 			float				fMin;
 			float				fMax;
 			int32				fUnlimited;
-			bool				fLayoutValid;
+			bool				fMinMaxValid;
 			bool				fOptimizerConstraintsAdded;
 };