ui/layout: drop CrossAxisAlignment value Stretch

It doesn't carry its own weight; client can just as easily adjust
the Constraints themselves.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-07-11 20:13:10 +02:00
parent 5c3398f33d
commit 0d49eb3f4b
2 changed files with 3 additions and 23 deletions
+2 -14
View File
@@ -43,7 +43,6 @@ const (
SpaceEvenly
Baseline CrossAxisAlignment = iota
Stretch
)
const (
@@ -85,7 +84,7 @@ func (f *Flex) Rigid() Constraints {
if mainc.Max != ui.Inf {
mainMax -= f.size
}
return axisConstraints(f.Axis, Constraint{Max: mainMax}, f.crossConstraintChild(f.cs))
return axisConstraints(f.Axis, Constraint{Max: mainMax}, axisCrossConstraint(f.Axis, f.cs))
}
func (f *Flex) Flexible(weight float32) Constraints {
@@ -101,7 +100,7 @@ func (f *Flex) Flexible(weight float32) Constraints {
}
}
submainc := Constraint{Max: flexSize}
return axisConstraints(f.Axis, submainc, f.crossConstraintChild(f.cs))
return axisConstraints(f.Axis, submainc, axisCrossConstraint(f.Axis, f.cs))
}
func (f *Flex) End(dims Dimens) FlexChild {
@@ -235,17 +234,6 @@ func axisCrossConstraint(a Axis, cs Constraints) Constraint {
}
}
func (f *Flex) crossConstraintChild(cs Constraints) Constraint {
c := axisCrossConstraint(f.Axis, cs)
switch f.CrossAxisAlignment {
case Stretch:
c.Min = c.Max
default:
c.Min = 0
}
return c
}
func axisConstraints(a Axis, mainc, crossc Constraint) Constraints {
if a == Horizontal {
return Constraints{mainc, crossc}