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 FlexMode

Browse Source 
The type and argument to Flex.Flexible does not carry its weight;
It is just as easy to expand the constraint directly.

While we're here, rename the flex argument to weight which is clearer.
This commit is contained in:
Elias Naur
2019-07-11 18:44:44 +02:00
parent 15505cd635
commit 449c2b844a
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/layout/flex.go
+2 -11
View File
@@ -31,15 +31,9 @@ type FlexChild struct {
type MainAxisSize uint8 type MainAxisSize uint8
type FlexMode uint8
type MainAxisAlignment uint8 type MainAxisAlignment uint8
type CrossAxisAlignment uint8 type CrossAxisAlignment uint8
const (
Loose FlexMode = iota
Fit
)
const ( const (
Max MainAxisSize = iota Max MainAxisSize = iota
Min Min
@@ -89,17 +83,14 @@ func (f *Flex) Rigid() Constraints {
return axisConstraints(f.Axis, Constraint{Max: mainMax}, f.crossConstraintChild(f.cs)) return axisConstraints(f.Axis, Constraint{Max: mainMax}, f.crossConstraintChild(f.cs))
} }
func (f *Flex) Flexible(flex float32, mode FlexMode) Constraints { func (f *Flex) Flexible(weight float32) Constraints {
f.begin() f.begin()
mainc := axisMainConstraint(f.Axis, f.cs) mainc := axisMainConstraint(f.Axis, f.cs)
var flexSize int var flexSize int
if mainc.Max != ui.Inf && mainc.Max > f.taken { if mainc.Max != ui.Inf && mainc.Max > f.taken {
flexSize = mainc.Max - f.taken flexSize = mainc.Max - f.taken
} }
submainc := Constraint{Max: int(float32(flexSize) * flex)} submainc := Constraint{Max: int(float32(flexSize) * weight)}
if mode == Fit {
submainc.Min = submainc.Max
}
return axisConstraints(f.Axis, submainc, f.crossConstraintChild(f.cs)) return axisConstraints(f.Axis, submainc, f.crossConstraintChild(f.cs))
} }