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

apps/gophers: remove CrossAxisAlignment Stretch values

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-07-11 20:15:11 +02:00
parent 0d49eb3f4b
commit fc7bb79c36
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/go.mod
+1 -1
View File
@@ -3,7 +3,7 @@ module gioui.org/apps
go 1.12 go 1.12
require ( require (
gioui.org/ui v0.0.0-20190711171517-10ef4576e7de gioui.org/ui v0.0.0-20190711181310-0d49eb3f4b31
github.com/google/go-github/v24 v24.0.1 github.com/google/go-github/v24 v24.0.1
golang.org/x/exp v0.0.0-20190627132806-fd42eb6b336f golang.org/x/exp v0.0.0-20190627132806-fd42eb6b336f
golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9 golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9
apps/gophers/main.go
+5 -2
View File
@@ -484,7 +484,7 @@ func (up *userPage) fetchCommits(ctx context.Context) {
func (a *App) layoutUsers(ops *ui.Ops, cs layout.Constraints) layout.Dimens { func (a *App) layoutUsers(ops *ui.Ops, cs layout.Constraints) layout.Dimens {
c := &a.cfg c := &a.cfg
st := (&layout.Stack{Alignment: layout.Center}).Init(ops, cs) st := (&layout.Stack{Alignment: layout.Start}).Init(ops, cs)
cs = st.Rigid() cs = st.Rigid()
al := layout.Align{Alignment: layout.SE} al := layout.Align{Alignment: layout.SE}
in := layout.EqualInsets(ui.Dp(16)) in := layout.EqualInsets(ui.Dp(16))
@@ -495,10 +495,11 @@ func (a *App) layoutUsers(ops *ui.Ops, cs layout.Constraints) layout.Dimens {
cs = st.Expand() cs = st.Expand()
{ {
f := (&layout.Flex{Axis: layout.Vertical, MainAxisAlignment: layout.Start, CrossAxisAlignment: layout.Stretch}).Init(ops, cs) f := (&layout.Flex{Axis: layout.Vertical, MainAxisAlignment: layout.Start}).Init(ops, cs)
cs = f.Rigid() cs = f.Rigid()
{ {
cs.Width.Min = cs.Width.Max
in := layout.EqualInsets(ui.Dp(16)) in := layout.EqualInsets(ui.Dp(16))
sz := c.Px(ui.Dp(200)) sz := c.Px(ui.Dp(200))
cs = cs.Exact(sz, sz) cs = cs.Exact(sz, sz)
@@ -509,6 +510,7 @@ func (a *App) layoutUsers(ops *ui.Ops, cs layout.Constraints) layout.Dimens {
cs = f.Rigid() cs = f.Rigid()
{ {
cs.Width.Min = cs.Width.Max
in := layout.Insets{Bottom: ui.Dp(16), Left: ui.Dp(16), Right: ui.Dp(16)} in := layout.Insets{Bottom: ui.Dp(16), Left: ui.Dp(16), Right: ui.Dp(16)}
dims = a.edit2.Layout(ops, in.Begin(c, ops, cs)) dims = a.edit2.Layout(ops, in.Begin(c, ops, cs))
dims = in.End(dims) dims = in.End(dims)
@@ -517,6 +519,7 @@ func (a *App) layoutUsers(ops *ui.Ops, cs layout.Constraints) layout.Dimens {
cs = f.Rigid() cs = f.Rigid()
{ {
cs.Width.Min = cs.Width.Max
s := layout.Stack{Alignment: layout.Center} s := layout.Stack{Alignment: layout.Center}
s.Init(ops, cs) s.Init(ops, cs)
cs = s.Rigid() cs = s.Rigid()