jx: horiz/vert partition: fix logic for FTC

jafl · Feb 8, 2024 · 4a54304 · 4a54304
1 parent e2debcd
commit 4a54304
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/libjx/code/JXHorizPartition.cpp b/libjx/code/JXHorizPartition.cpp
@@ -380,7 +380,8 @@ JXHorizPartition::RunInternalFTC
 			}
 
 			itsFTCSizes->AppendItem(w);
-			itsFTCMinSizes->AppendItem(JPartition::GetMinCompartmentSize(i) + delta);
+			const JCoordinate min = JPartition::GetMinCompartmentSize(i) + delta;
+			itsFTCMinSizes->AppendItem(delta >= 0 ? min : JMax(w, min));
 			sum += w;
 			i++;
 		}
@@ -433,14 +434,14 @@ JXHorizPartition::FTCAdjustSize
 
 	if (itsFTCSizes != nullptr)
 	{
-		SetCompartmentSizes(*itsFTCSizes);
-		jdelete itsFTCSizes;
-		itsFTCSizes = nullptr;
-
 		SetMinCompartmentSizes(*itsFTCMinSizes);
 		jdelete itsFTCMinSizes;
 		itsFTCMinSizes = nullptr;
 
+		SetCompartmentSizes(*itsFTCSizes);
+		jdelete itsFTCSizes;
+		itsFTCSizes = nullptr;
+
 		if (itsSavedGeom != nullptr)
 		{
 			RestoreGeometry(*itsSavedGeom);

diff --git a/libjx/code/JXVertPartition.cpp b/libjx/code/JXVertPartition.cpp
@@ -406,7 +406,8 @@ JXVertPartition::RunInternalFTC
 			}
 
 			itsFTCSizes->AppendItem(h);
-			itsFTCMinSizes->AppendItem(JPartition::GetMinCompartmentSize(i) + delta);
+			const JCoordinate min = JPartition::GetMinCompartmentSize(i) + delta;
+			itsFTCMinSizes->AppendItem(delta >= 0 ? min : JMax(h, min));
 			sum += h;
 			i++;
 		}
@@ -433,14 +434,14 @@ JXVertPartition::FTCAdjustSize
 
 	if (itsFTCSizes != nullptr)
 	{
-		SetCompartmentSizes(*itsFTCSizes);
-		jdelete itsFTCSizes;
-		itsFTCSizes = nullptr;
-
 		SetMinCompartmentSizes(*itsFTCMinSizes);
 		jdelete itsFTCMinSizes;
 		itsFTCMinSizes = nullptr;
 
+		SetCompartmentSizes(*itsFTCSizes);
+		jdelete itsFTCSizes;
+		itsFTCSizes = nullptr;
+
 		if (itsSavedGeom != nullptr)
 		{
 			RestoreGeometry(*itsSavedGeom);