ui/layout: rename and sanitize enums

Rename MainAxisAlignment to Spacing and CrossAxisAlignment to just
Alignment.

Drop the untyped Start, End, Center values and add them as Spacing
and Direction values. Center is both a Direction and Alignment, so
use the synonym "Middle" for the alignment.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-08-10 12:03:53 +02:00
parent 2a0b0077da
commit 1a15d7241a
4 changed files with 129 additions and 40 deletions
+6 -6
View File
@@ -8,8 +8,8 @@ import (
"gioui.org/ui"
"gioui.org/ui/gesture"
"gioui.org/ui/input"
"gioui.org/ui/pointer"
"gioui.org/ui/paint"
"gioui.org/ui/pointer"
)
type scrollChild struct {
@@ -18,9 +18,9 @@ type scrollChild struct {
}
type List struct {
Axis Axis
Invert bool
CrossAxisAlignment CrossAxisAlignment
Axis Axis
Invert bool
Alignment Alignment
// The distance scrolled since last call to Init.
Distance int
@@ -204,10 +204,10 @@ func (l *List) Layout() Dimens {
for _, child := range l.children {
sz := child.size
var cross int
switch l.CrossAxisAlignment {
switch l.Alignment {
case End:
cross = maxCross - axisCross(l.Axis, sz)
case Center:
case Middle:
cross = (maxCross - axisCross(l.Axis, sz)) / 2
}
childSize := axisMain(l.Axis, sz)