From 5c3398f33d8de025bb916c14a5835eecb183165f Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Thu, 11 Jul 2019 19:17:16 +0200 Subject: [PATCH] apps/gophers: drop MainAxisSize from Flex initializers Signed-off-by: Elias Naur --- apps/go.mod | 2 +- apps/gophers/main.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/go.mod b/apps/go.mod index 7d748598..12ac3c1d 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-20190711164444-449c2b844a40 + gioui.org/ui v0.0.0-20190711171517-10ef4576e7de 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/main.go b/apps/gophers/main.go index 5a4b9555..334d4e23 100644 --- a/apps/gophers/main.go +++ b/apps/gophers/main.go @@ -542,7 +542,7 @@ func (a *App) layoutUsers(ops *ui.Ops, cs layout.Constraints) layout.Dimens { func (a *ActionButton) Layout(ops *ui.Ops, cs layout.Constraints) layout.Dimens { c := a.config - f := layout.Flex{Axis: layout.Vertical, MainAxisAlignment: layout.Start, CrossAxisAlignment: layout.End, MainAxisSize: layout.Min} + f := layout.Flex{Axis: layout.Vertical, MainAxisAlignment: layout.Start, CrossAxisAlignment: layout.End} f.Init(ops, cs) cs = f.Rigid() in := layout.Insets{Top: ui.Dp(4)} @@ -661,11 +661,11 @@ func column() layout.Flex { } func centerRowOpts() layout.Flex { - return layout.Flex{Axis: layout.Horizontal, MainAxisAlignment: layout.Start, CrossAxisAlignment: layout.Center, MainAxisSize: layout.Min} + return layout.Flex{Axis: layout.Horizontal, MainAxisAlignment: layout.Start, CrossAxisAlignment: layout.Center} } func baseline() layout.Flex { - return layout.Flex{Axis: layout.Horizontal, CrossAxisAlignment: layout.Baseline, MainAxisSize: layout.Min} + return layout.Flex{Axis: layout.Horizontal, CrossAxisAlignment: layout.Baseline} } type clipCircle struct {