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: upgrade to OpArea API

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-06-03 15:24:00 +02:00
parent 955fe1bc77
commit 60fd129fda
2 changed files with 5 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-20190602201804-1e38eec0abc1 gioui.org/ui v0.0.0-20190603132211-955fe1bc7705
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-20190321205749-f0864edee7f3 golang.org/x/exp v0.0.0-20190321205749-f0864edee7f3
golang.org/x/image v0.0.0-20190321063152-3fc05d484e9f golang.org/x/image v0.0.0-20190321063152-3fc05d484e9f
apps/gophers/main.go
+4 -2
View File
@@ -553,7 +553,8 @@ func (a *ActionButton) Layout(ops *ui.Ops, cs layout.Constraints) layout.Dimens
in := layout.Insets{Top: c.Dp(4)} in := layout.Insets{Top: c.Dp(4)}
cs = in.Begin(ops, cs) cs = in.Begin(ops, cs)
dims := fab(ops, cs, a.sendIco.image(c), fabCol, c.Dp(56)) dims := fab(ops, cs, a.sendIco.image(c), fabCol, c.Dp(56))
a.btnClicker.Op(ops, &gesture.Ellipse{dims.Size}) pointer.AreaEllipse(dims.Size).Add(ops)
a.btnClicker.Add(ops)
dims = in.End(ops, dims) dims = in.End(ops, dims)
return f.Layout(ops, f.End(ops, dims)) return f.Layout(ops, f.End(ops, dims))
} }
@@ -638,7 +639,8 @@ func (a *App) user(ops *ui.Ops, cs layout.Constraints, c *ui.Config, index int)
c2 := f.End(ops, dims) c2 := f.End(ops, dims)
dims = f.Layout(ops, c1, c2) dims = f.Layout(ops, c1, c2)
dims = in.End(ops, dims) dims = in.End(ops, dims)
click.Op(ops, &gesture.Rect{dims.Size}) pointer.AreaRect(dims.Size).Add(ops)
click.Add(ops)
} }
c1 := elem.End(ops, dims) c1 := elem.End(ops, dims)
return elem.Layout(ops, c1) return elem.Layout(ops, c1)