From ba4fc4a57f9a38252f708f785f37aa24138dfe09 Mon Sep 17 00:00:00 2001 From: faiface Date: Thu, 9 May 2019 14:28:25 +0200 Subject: change event strings to event types --- examples/imageviewer/button.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'examples/imageviewer/button.go') diff --git a/examples/imageviewer/button.go b/examples/imageviewer/button.go index f2a619b..0693e06 100644 --- a/examples/imageviewer/button.go +++ b/examples/imageviewer/button.go @@ -6,6 +6,7 @@ import ( "image/draw" "github.com/faiface/gui" + "github.com/faiface/gui/win" ) func Button(env gui.Env, theme *Theme, text string, action func()) { @@ -34,23 +35,21 @@ func Button(env gui.Env, theme *Theme, text string, action func()) { ) for e := range env.Events() { - var x, y, x0, y0, x1, y1 int - - switch { - case e.Matches("resize/%d/%d/%d/%d", &x0, &y0, &x1, &y1): - r = image.Rect(x0, y0, x1, y1) + switch e := e.(type) { + case gui.Resize: + r = e.Rectangle env.Draw() <- redraw(r, over, pressed) - case e.Matches("mo/down/%d/%d/left", &x, &y): - newPressed := image.Pt(x, y).In(r) + case win.MoDown: + newPressed := e.Point.In(r) if newPressed != pressed { pressed = newPressed env.Draw() <- redraw(r, over, pressed) } - case e.Matches("mo/up/%d/%d/left", &x, &y): + case win.MoUp: if pressed { - if image.Pt(x, y).In(r) { + if e.Point.In(r) { action() } pressed = false -- cgit v1.2.3