Fixed upstream issue randrew/layout#15

codecat · Aug 11, 2024 · 8144c97 · 8144c97
1 parent 48f6c91
commit 8144c97
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/Nimble.Layout.Tests/TestCases.cs b/Nimble.Layout.Tests/TestCases.cs
@@ -693,5 +693,30 @@ public void AnchorRightMargin2()
 
 			Assert.AreEqual(new(40, 40, 50, 50), child.Rect);
 		}
+
+		[TestMethod]
+		public void IssueUpstream15()
+		{
+			var root = new LayoutItem {
+				Size = new(1, 100),
+			};
+
+			var row = new LayoutItem {
+				Contain = ContainFlags.Row,
+			};
+			root.AddChild(row);
+
+			var child = new LayoutItem {
+				Size = new(1, 50),
+				Margins = new(0, 0, 0, 10),
+			};
+			row.AddChild(child);
+
+			root.Run();
+
+			Assert.AreEqual(new(0, 0, 1, 100), root.Rect);
+			Assert.AreEqual(new(0, 20, 1, 60), row.Rect);
+			Assert.AreEqual(new(0, 20, 1, 50), child.Rect);
+		}
 	}
 }
diff --git a/Nimble.Layout/LayoutItem.cs b/Nimble.Layout/LayoutItem.cs
@@ -487,7 +487,7 @@ private void ArrangeOverlay(int dim)
 
 				switch (b_flags & BehaveFlags.HFill) {
 					case BehaveFlags.HCenter:
-						child.m_computedRect[dim] += (space - child.m_computedRect[2 + dim]) / 2 - child.Margins[wdim];
+						child.m_computedRect[dim] += (space - child.m_computedRect[2 + dim] - child.Margins[wdim]) / 2;
 						break;
 
 					case BehaveFlags.Right:
@@ -538,7 +538,7 @@ private static void ArrangeOverlaySqueezedRange(int dim, LayoutItem? startItem,
 				switch (b_flags & BehaveFlags.HFill) {
 					case BehaveFlags.HCenter:
 						item.m_computedRect[2 + dim] = Math.Min(item.m_computedRect[2 + dim], min_size);
-						item.m_computedRect[dim] += (space - item.m_computedRect[2 + dim]) / 2 - item.Margins[wdim];
+						item.m_computedRect[dim] += (space - item.m_computedRect[2 + dim] - item.Margins[wdim]) / 2;
 						break;
 
 					case BehaveFlags.Right: