apps/gophers: upgrade to new layout.List API

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-07-11 18:11:26 +02:00
parent fe4a61ec89
commit 15505cd635
2 changed files with 7 additions and 18 deletions
+1 -1
View File
@@ -3,7 +3,7 @@ module gioui.org/apps
go 1.12
require (
gioui.org/ui v0.0.0-20190711133118-bcd5685e78c6
gioui.org/ui v0.0.0-20190711160716-fe4a61ec890f
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
+6 -17
View File
@@ -428,13 +428,8 @@ func (up *userPage) Layout(ops *ui.Ops, cs layout.Constraints) layout.Dimens {
up.commits = commits
default:
}
l.Init(ops, cs, len(up.commits))
for {
i, cs, ok := l.Next()
if !ok {
break
}
l.End(up.commit(ops, cs, i))
for l.Init(ops, cs, len(up.commits)); l.More(); l.Next() {
l.Elem(up.commit(ops, l.Constraints(), l.Index()))
}
return l.Layout()
}
@@ -561,19 +556,13 @@ func (a *App) layoutContributors(ops *ui.Ops, cs layout.Constraints) layout.Dime
if l.Dragging() {
key.HideInputOp{}.Add(ops)
}
l.Init(ops, cs, len(a.users))
for {
i, cs, ok := l.Next()
if !ok {
break
}
l.End(a.user(ops, cs, c, i))
for l.Init(ops, cs, len(a.users)); l.More(); l.Next() {
l.Elem(a.user(c, ops, l.Constraints(), l.Index()))
}
dims := l.Layout()
return dims
return l.Layout()
}
func (a *App) user(ops *ui.Ops, cs layout.Constraints, c ui.Config, index int) layout.Dimens {
func (a *App) user(c ui.Config, ops *ui.Ops, cs layout.Constraints, index int) layout.Dimens {
u := a.users[index]
click := &a.userClicks[index]
for {