joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-06 01:45:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/gophers: update to ui.Config as an interface

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-07-10 17:23:31 +02:00
parent 32aae18293
commit cadfc88be2
2 changed files with 11 additions and 11 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-20190710120044-320579814f85 gioui.org/ui v0.0.0-20190710152055-32aae1829371
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
+10 -10
View File
@@ -49,7 +49,7 @@ import (
type App struct { type App struct {
w *app.Window w *app.Window
cfg ui.Config cfg app.Config
faces *measure.Faces faces *measure.Faces
inputs *input.Queue inputs *input.Queue
@@ -70,7 +70,7 @@ type App struct {
} }
type userPage struct { type userPage struct {
config *ui.Config config ui.Config
faces *measure.Faces faces *measure.Faces
redraw redrawer redraw redrawer
user *user user *user
@@ -98,7 +98,7 @@ type icon struct {
type redrawer func() type redrawer func()
type ActionButton struct { type ActionButton struct {
config *ui.Config config ui.Config
inputs input.Events inputs input.Events
face text.Face face text.Face
Open bool Open bool
@@ -448,7 +448,7 @@ func (up *userPage) commit(ops *ui.Ops, cs layout.Constraints, index int) layout
cs = in.Begin(c, ops, cs) cs = in.Begin(c, ops, cs)
f := (&layout.Flex{Axis: layout.Horizontal, MainAxisAlignment: layout.Start, CrossAxisAlignment: layout.Start}).Init(ops, cs) f := (&layout.Flex{Axis: layout.Horizontal, MainAxisAlignment: layout.Start, CrossAxisAlignment: layout.Start}).Init(ops, cs)
cs = f.Rigid() cs = f.Rigid()
sz := c.Dp(48) sz := c.Px(ui.Dp(48))
cc := clipCircle{} cc := clipCircle{}
cs = cc.Begin(ops, cs) cs = cc.Begin(ops, cs)
cs = cs.Exact(sz, sz) cs = cs.Exact(sz, sz)
@@ -504,7 +504,7 @@ func (a *App) layoutUsers(ops *ui.Ops, cs layout.Constraints) layout.Dimens {
cs = f.Rigid() cs = f.Rigid()
{ {
in := layout.EqualInsets(ui.Dp(16)) in := layout.EqualInsets(ui.Dp(16))
sz := c.Dp(200) sz := c.Px(ui.Dp(200))
cs = cs.Exact(sz, sz) cs = cs.Exact(sz, sz)
dims = a.edit.Layout(ops, in.Begin(c, ops, cs)) dims = a.edit.Layout(ops, in.Begin(c, ops, cs))
dims = in.End(dims) dims = in.End(dims)
@@ -549,7 +549,7 @@ func (a *ActionButton) Layout(ops *ui.Ops, cs layout.Constraints) layout.Dimens
cs = f.Rigid() cs = f.Rigid()
in := layout.Insets{Top: ui.Dp(4)} in := layout.Insets{Top: ui.Dp(4)}
cs = in.Begin(c, ops, cs) cs = in.Begin(c, ops, cs)
dims := fab(ops, cs, a.sendIco.image(c), theme.brand, c.Dp(56)) dims := fab(ops, cs, a.sendIco.image(c), theme.brand, c.Px(ui.Dp(56)))
pointer.AreaEllipse(dims.Size).Add(ops) pointer.AreaEllipse(dims.Size).Add(ops)
dims = in.End(dims) dims = in.End(dims)
return f.Layout(f.End(dims)) return f.Layout(f.End(dims))
@@ -573,7 +573,7 @@ func (a *App) layoutContributors(ops *ui.Ops, cs layout.Constraints) layout.Dime
return dims return dims
} }
func (a *App) user(ops *ui.Ops, cs layout.Constraints, c *ui.Config, index int) layout.Dimens { func (a *App) user(ops *ui.Ops, cs layout.Constraints, c ui.Config, index int) layout.Dimens {
u := a.users[index] u := a.users[index]
click := &a.userClicks[index] click := &a.userClicks[index]
for { for {
@@ -599,7 +599,7 @@ func (a *App) user(ops *ui.Ops, cs layout.Constraints, c *ui.Config, index int)
in := layout.Insets{Right: ui.Dp(8)} in := layout.Insets{Right: ui.Dp(8)}
cc := clipCircle{} cc := clipCircle{}
cs = cc.Begin(ops, in.Begin(c, ops, cs)) cs = cc.Begin(ops, in.Begin(c, ops, cs))
cs = cs.Exact(c.Dp(48), c.Dp(48)) cs = cs.Exact(c.Px(ui.Dp(48)), c.Px(ui.Dp(48)))
dims = widget.Image{Src: u.avatar, Rect: u.avatar.Bounds()}.Layout(c, ops, cs) dims = widget.Image{Src: u.avatar, Rect: u.avatar.Bounds()}.Layout(c, ops, cs)
dims = in.End(cc.End(dims)) dims = in.End(cc.End(dims))
} }
@@ -722,8 +722,8 @@ func toRectF(r image.Rectangle) f32.Rectangle {
} }
} }
func (ic *icon) image(cfg *ui.Config) image.Image { func (ic *icon) image(cfg ui.Config) image.Image {
sz := cfg.Pixels(ic.size) sz := cfg.Px(ic.size)
if sz == ic.imgSize { if sz == ic.imgSize {
return ic.img return ic.img
} }