joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-06 01:45:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui/layout: drop CrossAxisAlignment value Stretch

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
ui/layout/flex.go
+2 -14
View File
@@ -43,7 +43,6 @@ const (
SpaceEvenly SpaceEvenly
Baseline CrossAxisAlignment = iota Baseline CrossAxisAlignment = iota
Stretch
) )
const ( const (
@@ -85,7 +84,7 @@ func (f *Flex) Rigid() Constraints {
if mainc.Max != ui.Inf { if mainc.Max != ui.Inf {
mainMax -= f.size 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 { func (f *Flex) Flexible(weight float32) Constraints {
@@ -101,7 +100,7 @@ func (f *Flex) Flexible(weight float32) Constraints {
} }
} }
submainc := Constraint{Max: flexSize} 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 { 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 { func axisConstraints(a Axis, mainc, crossc Constraint) Constraints {
if a == Horizontal { if a == Horizontal {
return Constraints{mainc, crossc} return Constraints{mainc, crossc}
ui/layout/list.go
+1 -9
View File
@@ -113,7 +113,7 @@ func (l *List) Index() int {
// Constraints is the constraints for the current element. // Constraints is the constraints for the current element.
func (l *List) Constraints() Constraints { func (l *List) Constraints() Constraints {
return axisConstraints(l.Axis, Constraint{Max: ui.Inf}, l.crossConstraintChild(l.cs)) return axisConstraints(l.Axis, Constraint{Max: ui.Inf}, axisCrossConstraint(l.Axis, l.cs))
} }
func (l *List) More() bool { func (l *List) More() bool {
@@ -243,11 +243,3 @@ func (l *List) Layout() Dimens {
block.Add(ops) block.Add(ops)
return Dimens{Size: dims} return Dimens{Size: dims}
} }
func (l *List) crossConstraintChild(cs Constraints) Constraint {
c := axisCrossConstraint(l.Axis, cs)
if l.CrossAxisAlignment == Stretch {
c.Min = c.Max
}
return c
}