joejulian/gio-patched
1
0
Fork 0
forked from joejulian/gio
Code Pull Requests 1 Activity

layout: fixed divisions by zero in Flex.Layout

Browse Source 
Signed-off-by: pierre <pierre.curto@gmail.com>
This commit is contained in:
pierre
2020-12-03 14:02:37 +01:00
committed by Elias Naur
parent 69cc2c795c
commit e9cd8958de
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
layout/flex.go
+8
View File
@@ -165,8 +165,10 @@ func (f Flex) Layout(gtx Context, children ...FlexChild) Dimensions {
case SpaceEvenly: case SpaceEvenly:
mainSize += space / (1 + len(children)) mainSize += space / (1 + len(children))
case SpaceAround: case SpaceAround:
if len(children) > 0 {
mainSize += space / (len(children) * 2) mainSize += space / (len(children) * 2)
} }
}
for i, child := range children { for i, child := range children {
dims := child.dims dims := child.dims
b := dims.Size.Y - dims.Baseline b := dims.Size.Y - dims.Baseline
@@ -191,12 +193,16 @@ func (f Flex) Layout(gtx Context, children ...FlexChild) Dimensions {
case SpaceEvenly: case SpaceEvenly:
mainSize += space / (1 + len(children)) mainSize += space / (1 + len(children))
case SpaceAround: case SpaceAround:
if len(children) > 0 {
mainSize += space / len(children) mainSize += space / len(children)
}
case SpaceBetween: case SpaceBetween:
if len(children) > 1 {
mainSize += space / (len(children) - 1) mainSize += space / (len(children) - 1)
} }
} }
} }
}
switch f.Spacing { switch f.Spacing {
case SpaceSides: case SpaceSides:
mainSize += space / 2 mainSize += space / 2
@@ -205,8 +211,10 @@ func (f Flex) Layout(gtx Context, children ...FlexChild) Dimensions {
case SpaceEvenly: case SpaceEvenly:
mainSize += space / (1 + len(children)) mainSize += space / (1 + len(children))
case SpaceAround: case SpaceAround:
if len(children) > 0 {
mainSize += space / (len(children) * 2) mainSize += space / (len(children) * 2)
} }
}
sz := axisPoint(f.Axis, mainSize, maxCross) sz := axisPoint(f.Axis, mainSize, maxCross)
return Dimensions{Size: sz, Baseline: sz.Y - maxBaseline} return Dimensions{Size: sz, Baseline: sz.Y - maxBaseline}
} }