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

layout: fix Flex baseline

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-10-16 20:35:24 +02:00
parent b1643e5e2a
commit 759900902a
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
layout/flex.go
+1 -5
View File
@@ -128,7 +128,6 @@ func (f *Flex) Layout(gtx *Context, children ...FlexChild) {
space = mainc.Min - f.size space = mainc.Min - f.size
} }
var mainSize int var mainSize int
var baseline int
switch f.Spacing { switch f.Spacing {
case SpaceSides: case SpaceSides:
mainSize += space / 2 mainSize += space / 2
@@ -151,9 +150,6 @@ func (f *Flex) Layout(gtx *Context, children ...FlexChild) {
case Baseline: case Baseline:
if f.Axis == Horizontal { if f.Axis == Horizontal {
cross = maxBaseline - b cross = maxBaseline - b
if dims.Baseline != 0 {
baseline = maxCross - b
}
} }
} }
var stack op.StackOp var stack op.StackOp
@@ -184,7 +180,7 @@ func (f *Flex) Layout(gtx *Context, children ...FlexChild) {
mainSize += space / (len(children) * 2) mainSize += space / (len(children) * 2)
} }
sz := axisPoint(f.Axis, mainSize, maxCross) sz := axisPoint(f.Axis, mainSize, maxCross)
gtx.Dimensions = Dimensions{Size: sz, Baseline: baseline} gtx.Dimensions = Dimensions{Size: sz, Baseline: sz.Y - maxBaseline}
f.size = 0 f.size = 0
f.rigidSize = 0 f.rigidSize = 0
} }