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

apps/gophers: update gio version

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-08-30 15:03:49 +02:00
parent 12089ea62a
commit 7bca7de017
3 changed files with 19 additions and 19 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-20190824172537-c3f30188a573 gioui.org/ui v0.0.0-20190830130017-12089ea62a84
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/go.sum
+2 -2
View File
@@ -1,6 +1,6 @@
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
gioui.org/ui v0.0.0-20190824172537-c3f30188a573 h1:8Hz2KYYy143y4RaWEsVv/YjB7i8b2NW1sr5oz7mgXig= gioui.org/ui v0.0.0-20190830130017-12089ea62a84 h1:VudF7+n7NE+7Gk5736Zfk8PQ4CITanffxNpALHfQcJQ=
gioui.org/ui v0.0.0-20190824172537-c3f30188a573/go.mod h1:dmqi7kyK1sZ03VAkEqzKKpKWfRPCuqrd1eDtSqyhjzY= gioui.org/ui v0.0.0-20190830130017-12089ea62a84/go.mod h1:dmqi7kyK1sZ03VAkEqzKKpKWfRPCuqrd1eDtSqyhjzY=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
apps/gophers/ui.go
+16 -16
View File
@@ -172,9 +172,9 @@ func (u *UI) face(f *sfnt.Font, size float32) text.Face {
return u.faces.For(f, ui.Sp(size)) return u.faces.For(f, ui.Sp(size))
} }
func (u *UI) layoutTimings(c ui.Config, q input.Queue, ops *ui.Ops, cs layout.Constraints) layout.Dimens { func (u *UI) layoutTimings(c ui.Config, q input.Queue, ops *ui.Ops, cs layout.Constraints) layout.Dimensions {
if !u.profiling { if !u.profiling {
return layout.Dimens{} return layout.Dimensions{}
} }
for e, ok := q.Next(u); ok; e, ok = q.Next(u) { for e, ok := q.Next(u); ok; e, ok = q.Next(u) {
if e, ok := e.(system.ProfileEvent); ok { if e, ok := e.(system.ProfileEvent); ok {
@@ -196,7 +196,7 @@ func (u *UI) layoutTimings(c ui.Config, q input.Queue, ops *ui.Ops, cs layout.Co
return al.End(dims) return al.End(dims)
} }
func (u *UI) Layout(c ui.Config, q input.Queue, ops *ui.Ops, cs layout.Constraints) layout.Dimens { func (u *UI) Layout(c ui.Config, q input.Queue, ops *ui.Ops, cs layout.Constraints) layout.Dimensions {
u.faces.Reset(c) u.faces.Reset(c)
for i := range u.userClicks { for i := range u.userClicks {
click := &u.userClicks[i] click := &u.userClicks[i]
@@ -206,7 +206,7 @@ func (u *UI) Layout(c ui.Config, q input.Queue, ops *ui.Ops, cs layout.Constrain
} }
} }
} }
var dims layout.Dimens var dims layout.Dimensions
if u.selectedUser == nil { if u.selectedUser == nil {
dims = u.layoutUsers(c, q, ops, cs) dims = u.layoutUsers(c, q, ops, cs)
} else { } else {
@@ -226,7 +226,7 @@ func (u *UI) newUserPage(user *user) *userPage {
return up return up
} }
func (up *userPage) Layout(c ui.Config, q input.Queue, ops *ui.Ops, cs layout.Constraints) layout.Dimens { func (up *userPage) Layout(c ui.Config, q input.Queue, ops *ui.Ops, cs layout.Constraints) layout.Dimensions {
l := up.commitsList l := up.commitsList
if l.Dragging() { if l.Dragging() {
key.HideInputOp{}.Add(ops) key.HideInputOp{}.Add(ops)
@@ -237,7 +237,7 @@ func (up *userPage) Layout(c ui.Config, q input.Queue, ops *ui.Ops, cs layout.Co
return l.Layout() return l.Layout()
} }
func (up *userPage) commit(c ui.Config, ops *ui.Ops, cs layout.Constraints, index int) layout.Dimens { func (up *userPage) commit(c ui.Config, ops *ui.Ops, cs layout.Constraints, index int) layout.Dimensions {
u := up.user u := up.user
msg := up.commits[index].GetMessage() msg := up.commits[index].GetMessage()
label := text.Label{Material: theme.text, Face: up.faces.For(fonts.regular, ui.Sp(12)), Text: msg} label := text.Label{Material: theme.text, Face: up.faces.For(fonts.regular, ui.Sp(12)), Text: msg}
@@ -263,7 +263,7 @@ func (up *userPage) commit(c ui.Config, ops *ui.Ops, cs layout.Constraints, inde
return in.End(dims) return in.End(dims)
} }
func (u *UI) layoutUsers(c ui.Config, q input.Queue, ops *ui.Ops, cs layout.Constraints) layout.Dimens { func (u *UI) layoutUsers(c ui.Config, q input.Queue, ops *ui.Ops, cs layout.Constraints) layout.Dimensions {
st := (&layout.Stack{}).Init(ops, cs) st := (&layout.Stack{}).Init(ops, cs)
cs = st.Rigid() cs = st.Rigid()
al := layout.Align{Alignment: layout.SE} al := layout.Align{Alignment: layout.SE}
@@ -323,7 +323,7 @@ func (u *UI) layoutUsers(c ui.Config, q input.Queue, ops *ui.Ops, cs layout.Cons
return st.Layout(c1, c2) return st.Layout(c1, c2)
} }
func (a *ActionButton) Layout(c ui.Config, q input.Queue, ops *ui.Ops, cs layout.Constraints) layout.Dimens { func (a *ActionButton) Layout(c ui.Config, q input.Queue, ops *ui.Ops, cs layout.Constraints) layout.Dimensions {
f := layout.Flex{Axis: layout.Vertical, Alignment: layout.End} f := layout.Flex{Axis: layout.Vertical, Alignment: layout.End}
f.Init(ops, cs) f.Init(ops, cs)
cs = f.Rigid() cs = f.Rigid()
@@ -335,7 +335,7 @@ func (a *ActionButton) Layout(c ui.Config, q input.Queue, ops *ui.Ops, cs layout
return f.Layout(f.End(dims)) return f.Layout(f.End(dims))
} }
func (u *UI) layoutContributors(c ui.Config, q input.Queue, ops *ui.Ops, cs layout.Constraints) layout.Dimens { func (u *UI) layoutContributors(c ui.Config, q input.Queue, ops *ui.Ops, cs layout.Constraints) layout.Dimensions {
l := u.usersList l := u.usersList
if l.Dragging() { if l.Dragging() {
key.HideInputOp{}.Add(ops) key.HideInputOp{}.Add(ops)
@@ -346,12 +346,12 @@ func (u *UI) layoutContributors(c ui.Config, q input.Queue, ops *ui.Ops, cs layo
return l.Layout() return l.Layout()
} }
func (u *UI) user(c ui.Config, ops *ui.Ops, cs layout.Constraints, index int) layout.Dimens { func (u *UI) user(c ui.Config, ops *ui.Ops, cs layout.Constraints, index int) layout.Dimensions {
user := u.users[index] user := u.users[index]
elem := layout.Flex{Axis: layout.Vertical} elem := layout.Flex{Axis: layout.Vertical}
elem.Init(ops, cs) elem.Init(ops, cs)
cs = elem.Rigid() cs = elem.Rigid()
var dims layout.Dimens var dims layout.Dimensions
{ {
in := layout.UniformInset(ui.Dp(8)) in := layout.UniformInset(ui.Dp(8))
cs = in.Begin(c, ops, cs) cs = in.Begin(c, ops, cs)
@@ -413,14 +413,14 @@ type fill struct {
material ui.MacroOp material ui.MacroOp
} }
func (f fill) Layout(ops *ui.Ops, cs layout.Constraints) layout.Dimens { func (f fill) Layout(ops *ui.Ops, cs layout.Constraints) layout.Dimensions {
d := image.Point{X: cs.Width.Max, Y: cs.Height.Max} d := image.Point{X: cs.Width.Max, Y: cs.Height.Max}
dr := f32.Rectangle{ dr := f32.Rectangle{
Max: f32.Point{X: float32(d.X), Y: float32(d.Y)}, Max: f32.Point{X: float32(d.X), Y: float32(d.Y)},
} }
f.material.Add(ops) f.material.Add(ops)
paint.PaintOp{Rect: dr}.Add(ops) paint.PaintOp{Rect: dr}.Add(ops)
return layout.Dimens{Size: d, Baseline: d.Y} return layout.Dimensions{Size: d, Baseline: d.Y}
} }
func column() layout.Flex { func column() layout.Flex {
@@ -446,7 +446,7 @@ func (c *clipCircle) Begin(ops *ui.Ops, cs layout.Constraints) layout.Constraint
return cs return cs
} }
func (c *clipCircle) End(dims layout.Dimens) layout.Dimens { func (c *clipCircle) End(dims layout.Dimensions) layout.Dimensions {
c.m.Stop() c.m.Stop()
ops := c.ops ops := c.ops
max := dims.Size.X max := dims.Size.X
@@ -463,7 +463,7 @@ func (c *clipCircle) End(dims layout.Dimens) layout.Dimens {
return dims return dims
} }
func fab(ops *ui.Ops, ico image.Image, mat ui.MacroOp, size int) layout.Dimens { func fab(ops *ui.Ops, ico image.Image, mat ui.MacroOp, size int) layout.Dimensions {
dp := image.Point{X: (size - ico.Bounds().Dx()) / 2, Y: (size - ico.Bounds().Dy()) / 2} dp := image.Point{X: (size - ico.Bounds().Dx()) / 2, Y: (size - ico.Bounds().Dy()) / 2}
dims := image.Point{X: size, Y: size} dims := image.Point{X: size, Y: size}
rr := float32(size) * .5 rr := float32(size) * .5
@@ -474,7 +474,7 @@ func fab(ops *ui.Ops, ico image.Image, mat ui.MacroOp, size int) layout.Dimens {
paint.PaintOp{ paint.PaintOp{
Rect: toRectF(ico.Bounds().Add(dp)), Rect: toRectF(ico.Bounds().Add(dp)),
}.Add(ops) }.Add(ops)
return layout.Dimens{Size: dims} return layout.Dimensions{Size: dims}
} }
func toRectF(r image.Rectangle) f32.Rectangle { func toRectF(r image.Rectangle) f32.Rectangle {