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

layout: rename Flex.Flexible to just Flex

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-10-06 09:20:04 +02:00
parent 8d82a3eaa6
commit 529fd4d307
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
layout/flex.go
+4 -4
View File
@@ -22,7 +22,7 @@ type Flex struct {
size int size int
rigidSize int rigidSize int
// fraction is the rounding error from a Flexible weighting. // fraction is the rounding error from a Flex weighting.
fraction float32 fraction float32
maxCross int maxCross int
maxBaseline int maxBaseline int
@@ -76,16 +76,16 @@ func (f *Flex) Rigid(gtx *Context, w Widget) FlexChild {
return FlexChild{m, dims} return FlexChild{m, dims}
} }
// Flexible is like Rigid, where the main axis size is also constrained to a // Flex is like Rigid, where the main axis size is also constrained to a
// fraction of the space not taken up by Rigid children. // fraction of the space not taken up by Rigid children.
func (f *Flex) Flexible(gtx *Context, weight float32, w Widget) FlexChild { func (f *Flex) Flex(gtx *Context, weight float32, w Widget) FlexChild {
cs := gtx.Constraints cs := gtx.Constraints
mainc := axisMainConstraint(f.Axis, cs) mainc := axisMainConstraint(f.Axis, cs)
var flexSize int var flexSize int
if mainc.Max > f.size { if mainc.Max > f.size {
flexSize = mainc.Max - f.rigidSize flexSize = mainc.Max - f.rigidSize
// Apply weight and add any leftover fraction from a // Apply weight and add any leftover fraction from a
// previous Flexible. // previous Flex.
size := float32(flexSize)*weight + f.fraction size := float32(flexSize)*weight + f.fraction
flexSize = int(size + .5) flexSize = int(size + .5)
f.fraction = size - float32(flexSize) f.fraction = size - float32(flexSize)
layout/layout_test.go
+1 -1
View File
@@ -71,7 +71,7 @@ func ExampleFlex() {
}) })
// Child with 50% space allowance. // Child with 50% space allowance.
child2 := flex.Flexible(gtx, 0.5, func() { child2 := flex.Flex(gtx, 0.5, func() {
fmt.Printf("50%%: %v\n", gtx.Constraints.Width) fmt.Printf("50%%: %v\n", gtx.Constraints.Width)
layoutWidget(gtx, 10, 10) layoutWidget(gtx, 10, 10)
}) })