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

cmd/gophers: update to integer ui.Config pixel values

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-07-10 13:36:26 +02:00
parent ad4215a7eb
commit 2aac09b3b2
2 changed files with 12 additions and 13 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-20190710091845-25af3e3701de gioui.org/ui v0.0.0-20190710113106-ad4215a7ebb1
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
+11 -12
View File
@@ -92,7 +92,7 @@ type icon struct {
// Cached values. // Cached values.
img image.Image img image.Image
imgSize float32 imgSize int
} }
type redrawer func() type redrawer func()
@@ -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 := int(c.Dp(48)+.5) sz := c.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 := int(c.Dp(200)+.5) sz := c.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)
@@ -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(int(c.Dp(48)+.5), int(c.Dp(48)+.5)) cs = cs.Exact(c.Dp(48), c.Dp(48))
dims = widget.Image{Src: u.avatar, Rect: u.avatar.Bounds(), Scale: 1}.Layout(c, ops, cs) dims = widget.Image{Src: u.avatar, Rect: u.avatar.Bounds(), Scale: 1}.Layout(c, ops, cs)
dims = in.End(cc.End(dims)) dims = in.End(cc.End(dims))
} }
@@ -701,14 +701,13 @@ func (c *clipCircle) End(dims layout.Dimens) layout.Dimens {
return dims return dims
} }
func fab(ops *ui.Ops, cs layout.Constraints, ico image.Image, mat ui.BlockOp, size float32) layout.Dimens { func fab(ops *ui.Ops, cs layout.Constraints, ico image.Image, mat ui.BlockOp, size int) layout.Dimens {
sz := int(size + .5) dp := image.Point{X: (size - ico.Bounds().Dx()) / 2, Y: (size - ico.Bounds().Dy()) / 2}
rr := size * .5 dims := image.Point{X: size, Y: size}
dp := image.Point{X: (sz - ico.Bounds().Dx()) / 2, Y: (sz - ico.Bounds().Dy()) / 2} rr := float32(size) * .5
dims := image.Point{X: sz, Y: sz} rrect(ops, float32(size), float32(size), rr, rr, rr, rr)
rrect(ops, size, size, rr, rr, rr, rr)
mat.Add(ops) mat.Add(ops)
gdraw.DrawOp{Rect: f32.Rectangle{Max: f32.Point{X: float32(sz), Y: float32(sz)}}}.Add(ops) gdraw.DrawOp{Rect: f32.Rectangle{Max: f32.Point{X: float32(size), Y: float32(size)}}}.Add(ops)
gdraw.ImageOp{Img: ico, Rect: ico.Bounds()}.Add(ops) gdraw.ImageOp{Img: ico, Rect: ico.Bounds()}.Add(ops)
gdraw.DrawOp{ gdraw.DrawOp{
Rect: toRectF(ico.Bounds().Add(dp)), Rect: toRectF(ico.Bounds().Add(dp)),
@@ -730,7 +729,7 @@ func (ic *icon) image(cfg *ui.Config) image.Image {
} }
m, _ := iconvg.DecodeMetadata(ic.src) m, _ := iconvg.DecodeMetadata(ic.src)
dx, dy := m.ViewBox.AspectRatio() dx, dy := m.ViewBox.AspectRatio()
img := image.NewRGBA(image.Rectangle{Max: image.Point{X: int(sz), Y: int(sz * dy / dx)}}) img := image.NewRGBA(image.Rectangle{Max: image.Point{X: sz, Y: int(float32(sz) * dy / dx)}})
var ico iconvg.Rasterizer var ico iconvg.Rasterizer
ico.SetDstImage(img, img.Bounds(), draw.Src) ico.SetDstImage(img, img.Bounds(), draw.Src)
// Use white for icons. // Use white for icons.