Merge pull request #28 from yohamta/fix-bug

Fix margin bug
yohamta · Nov 26, 2022 · 04dc837 · 04dc837
2 parents 48bccd1 + 4c4a998
commit 04dc837
Show file tree

Hide file tree

Showing 2 changed files with 146 additions and 6 deletions.
diff --git a/flex.go b/flex.go
@@ -190,10 +190,11 @@ func (f *flexEmbed) layout(width, height int, container *containerEmbed) {
 			remFreeSpace := float64(f.mainSize(width, height))
 			unfrozenFlexFactor := 0.0
 			for _, child := range line.child {
+				mainMargin := child.mainMargin[0] + child.mainMargin[1]
 				if child.frozen {
-					remFreeSpace -= child.mainSize
+					remFreeSpace -= (child.mainSize + mainMargin)
 				} else {
-					remFreeSpace -= float64(f.mainSize(child.node.item.Width, child.node.item.Height))
+					remFreeSpace -= (float64(f.mainSize(child.node.item.Width, child.node.item.Height)) + mainMargin)
 					if grow {
 						unfrozenFlexFactor += child.node.item.Grow
 					} else {
@@ -307,7 +308,8 @@ func (f *flexEmbed) layout(width, height int, container *containerEmbed) {
 			if f.AlignItems == AlignItemStretch &&
 				f.crossSize(child.node.item.Width, child.node.item.Height) == 0 &&
 				child.crossSize < line.crossSize {
-				child.crossSize = line.crossSize
+				crossMargin := child.crossMargin[0] + child.crossMargin[1]
+				child.crossSize = line.crossSize - crossMargin
 			}
 		}
 	}

diff --git a/flex_test.go b/flex_test.go
@@ -576,7 +576,8 @@ func TestMerginWithChild(t *testing.T) {
 		Justify:    JustifyEnd,
 	}
 
-	mock := mockHandler{}
+	mock1 := mockHandler{}
+	mock2 := mockHandler{}
 
 	flex.AddChild(
 		(&View{
@@ -585,19 +586,156 @@ func TestMerginWithChild(t *testing.T) {
 			Direction:    Column,
 			AlignItems:   AlignItemEnd,
 			Justify:      JustifyEnd,
+			Handler:      &mock1,
 		}).AddChild(
 			&View{
+				Grow:    1,
 				Width:   100,
 				Height:  100,
-				Handler: &mock,
+				Handler: &mock2,
 			},
 		),
 	)
 
 	flex.Update()
 	flex.Draw(nil)
 
-	assert.Equal(t, image.Rect(850, 800, 950, 900), mock.Frame)
+	assert.Equal(t, image.Rect(950, 900, 950, 900), mock1.Frame)
+	assert.Equal(t, image.Rect(850, 800, 950, 900), mock2.Frame)
+}
+
+func TestStretchAndMargin(t *testing.T) {
+	flex := &View{
+		Width:      1000,
+		Height:     1000,
+		AlignItems: AlignItemStretch,
+	}
+
+	mock1 := mockHandler{}
+	mock2 := mockHandler{}
+
+	flex.AddChild(
+		(&View{
+			MarginRight:  50,
+			MarginBottom: 100,
+			Grow:         1,
+			Direction:    Column,
+			AlignItems:   AlignItemEnd,
+			Justify:      JustifyEnd,
+			Handler:      &mock1,
+		}).AddChild(
+			&View{
+				Width:   100,
+				Height:  100,
+				Handler: &mock2,
+			},
+		),
+	)
+
+	flex.Update()
+	flex.Draw(nil)
+
+	assert.Equal(t, image.Rect(0, 0, 950, 900), mock1.Frame)
+	assert.Equal(t, image.Rect(850, 800, 950, 900), mock2.Frame)
+}
+
+func TestStretchAndMarginItems(t *testing.T) {
+	flex := &View{
+		Width:      1000,
+		Height:     1000,
+		AlignItems: AlignItemStretch,
+	}
+
+	mock1 := mockHandler{}
+	mock2 := mockHandler{}
+
+	flex.AddChild(
+		&View{
+			MarginRight: 50,
+			Grow:        1,
+			Handler:     &mock1,
+		},
+		&View{
+			MarginLeft: 50,
+			Grow:       1,
+			Handler:    &mock2,
+		},
+	)
+
+	flex.Update()
+	flex.Draw(nil)
+
+	assert.Equal(t, image.Rect(0, 0, 450, 1000), mock1.Frame)
+	assert.Equal(t, image.Rect(550, 0, 1000, 1000), mock2.Frame)
+}
+
+func TestStretchAndMarginItemsMain(t *testing.T) {
+	flex := &View{
+		Width:      1000,
+		Height:     1000,
+		AlignItems: AlignItemStretch,
+		Wrap:       Wrap,
+		Direction:  Column,
+	}
+
+	mock1 := mockHandler{}
+	mock2 := mockHandler{}
+
+	flex.AddChild(
+		&View{
+			Width:        1000,
+			MarginBottom: 50,
+			Grow:         1,
+			Handler:      &mock1,
+		},
+		&View{
+			Width:        1000,
+			MarginBottom: 50,
+			Grow:         1,
+			Handler:      &mock2,
+		},
+	)
+
+	flex.Update()
+	flex.Draw(nil)
+
+	assert.Equal(t, image.Rect(0, 0, 1000, 450), mock1.Frame)
+	assert.Equal(t, image.Rect(0, 500, 1000, 950), mock2.Frame)
+}
+
+func TestStretchAndMarginItemsCross(t *testing.T) {
+	flex := &View{
+		Width:        1000,
+		Height:       1000,
+		AlignItems:   AlignItemStretch,
+		AlignContent: AlignContentStretch,
+		Wrap:         Wrap,
+		Direction:    Row,
+	}
+
+	mock1 := mockHandler{}
+	mock2 := mockHandler{}
+
+	flex.AddChild(
+		&View{
+			Width:        1000,
+			MarginBottom: 50,
+			Grow:         1,
+			Handler:      &mock1,
+		},
+		&View{
+			Width:        1000,
+			MarginBottom: 50,
+			Grow:         1,
+			Handler:      &mock2,
+		},
+	)
+
+	flex.Update()
+	flex.Draw(nil)
+
+	assert.Equal(t, image.Rect(0, 0, 1000, 450), mock1.Frame)
+	assert.Equal(t, image.Rect(0, 500, 1000, 950), mock2.Frame)
 }
 
 func flexItemBounds(parent *View, child *View) image.Rectangle {