diff --git a/apps/go.mod b/apps/go.mod index e550315b..7ebd9a80 100644 --- a/apps/go.mod +++ b/apps/go.mod @@ -3,7 +3,7 @@ module gioui.org/apps go 1.12 require ( - gioui.org/ui v0.0.0-20190807183537-4e005f2bfa1c + gioui.org/ui v0.0.0-20190810102917-1a15d7241ac4 github.com/google/go-github/v24 v24.0.1 golang.org/x/exp v0.0.0-20190627132806-fd42eb6b336f golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9 diff --git a/apps/gophers/ui.go b/apps/gophers/ui.go index da32decd..e1694a3c 100644 --- a/apps/gophers/ui.go +++ b/apps/gophers/ui.go @@ -244,7 +244,7 @@ func (up *userPage) commit(c ui.Config, ops *ui.Ops, cs layout.Constraints, inde label := text.Label{Material: theme.text, Face: up.faces.For(fonts.regular, ui.Sp(12)), Text: msg} in := layout.Inset{Top: ui.Dp(16), Right: ui.Dp(8), Left: ui.Dp(8)} cs = in.Begin(c, ops, cs) - f := (&layout.Flex{Axis: layout.Horizontal, MainAxisAlignment: layout.Start, CrossAxisAlignment: layout.Start}).Init(ops, cs) + f := (&layout.Flex{Axis: layout.Horizontal}).Init(ops, cs) cs = f.Rigid() sz := c.Px(ui.Dp(48)) cc := clipCircle{} @@ -265,7 +265,7 @@ func (up *userPage) commit(c ui.Config, ops *ui.Ops, cs layout.Constraints, inde } func (u *UI) layoutUsers(c ui.Config, q input.Queue, ops *ui.Ops, cs layout.Constraints) layout.Dimens { - st := (&layout.Stack{Alignment: layout.Start}).Init(ops, cs) + st := (&layout.Stack{}).Init(ops, cs) cs = st.Rigid() al := layout.Align{Alignment: layout.SE} in := layout.UniformInset(ui.Dp(16)) @@ -276,7 +276,7 @@ func (u *UI) layoutUsers(c ui.Config, q input.Queue, ops *ui.Ops, cs layout.Cons cs = st.Expand() { - f := (&layout.Flex{Axis: layout.Vertical, MainAxisAlignment: layout.Start}).Init(ops, cs) + f := (&layout.Flex{Axis: layout.Vertical}).Init(ops, cs) cs = f.Rigid() { @@ -325,7 +325,7 @@ func (u *UI) layoutUsers(c ui.Config, q input.Queue, ops *ui.Ops, cs layout.Cons } func (a *ActionButton) Layout(c ui.Config, q input.Queue, ops *ui.Ops, cs layout.Constraints) layout.Dimens { - f := layout.Flex{Axis: layout.Vertical, MainAxisAlignment: layout.Start, CrossAxisAlignment: layout.End} + f := layout.Flex{Axis: layout.Vertical, Alignment: layout.End} f.Init(ops, cs) cs = f.Rigid() in := layout.Inset{Top: ui.Dp(4)} @@ -349,7 +349,7 @@ func (u *UI) layoutContributors(c ui.Config, q input.Queue, ops *ui.Ops, cs layo func (u *UI) user(c ui.Config, ops *ui.Ops, cs layout.Constraints, index int) layout.Dimens { user := u.users[index] - elem := layout.Flex{Axis: layout.Vertical, MainAxisAlignment: layout.Start, CrossAxisAlignment: layout.Start} + elem := layout.Flex{Axis: layout.Vertical} elem.Init(ops, cs) cs = elem.Rigid() var dims layout.Dimens @@ -425,15 +425,15 @@ func (f fill) Layout(ops *ui.Ops, cs layout.Constraints) layout.Dimens { } func column() layout.Flex { - return layout.Flex{Axis: layout.Vertical, MainAxisAlignment: layout.Start, CrossAxisAlignment: layout.Start} + return layout.Flex{Axis: layout.Vertical} } func centerRowOpts() layout.Flex { - return layout.Flex{Axis: layout.Horizontal, MainAxisAlignment: layout.Start, CrossAxisAlignment: layout.Center} + return layout.Flex{Axis: layout.Horizontal, Alignment: layout.Middle} } func baseline() layout.Flex { - return layout.Flex{Axis: layout.Horizontal, CrossAxisAlignment: layout.Baseline} + return layout.Flex{Axis: layout.Horizontal, Alignment: layout.Baseline} } type clipCircle struct { diff --git a/ui/layout/flex.go b/ui/layout/flex.go index dc4a6062..9502ed9e 100644 --- a/ui/layout/flex.go +++ b/ui/layout/flex.go @@ -14,7 +14,7 @@ import ( type Flex struct { // Axis is the main axis, either Horizontal or Vertical. Axis Axis - // Spacing controls the distribution of any space left after + // Spacing controls the distribution of space left after // layout. Spacing Spacing // Alignment is the alignment in the cross axis.