From de5d2f5c78da7f8a578ecc25f8e8b1fa90f20264 Mon Sep 17 00:00:00 2001 From: faiface Date: Tue, 7 May 2019 22:40:27 +0200 Subject: examples/imageviewer: rename DrawText to MakeTextImage --- examples/imageviewer/browser.go | 4 ++-- examples/imageviewer/button.go | 2 +- examples/imageviewer/util.go | 2 +- examples/imageviewer/viewer.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'examples') diff --git a/examples/imageviewer/browser.go b/examples/imageviewer/browser.go index a5fb461..5a79c3b 100644 --- a/examples/imageviewer/browser.go +++ b/examples/imageviewer/browser.go @@ -33,7 +33,7 @@ func Browser(env gui.Env, theme *Theme, dir string, cd <-chan string, view chan< var images []image.Image for _, name := range names { - images = append(images, DrawText(name, theme.Face, theme.Text)) + images = append(images, MakeTextImage(name, theme.Face, theme.Text)) } const inset = 4 @@ -113,7 +113,7 @@ func Browser(env gui.Env, theme *Theme, dir string, cd <-chan string, view chan< var ( x0, y0, x1, y1 int - x, y int + x, y int ) switch { diff --git a/examples/imageviewer/button.go b/examples/imageviewer/button.go index 8d448e4..f2a619b 100644 --- a/examples/imageviewer/button.go +++ b/examples/imageviewer/button.go @@ -9,7 +9,7 @@ import ( ) func Button(env gui.Env, theme *Theme, text string, action func()) { - textImg := DrawText(text, theme.Face, theme.Text) + textImg := MakeTextImage(text, theme.Face, theme.Text) redraw := func(r image.Rectangle, over, pressed bool) func(draw.Image) image.Rectangle { return func(drw draw.Image) image.Rectangle { diff --git a/examples/imageviewer/util.go b/examples/imageviewer/util.go index 94f25fb..e799988 100644 --- a/examples/imageviewer/util.go +++ b/examples/imageviewer/util.go @@ -63,7 +63,7 @@ func TTFToFace(ttf []byte, size float64) (font.Face, error) { })}, nil } -func DrawText(text string, face font.Face, clr color.Color) image.Image { +func MakeTextImage(text string, face font.Face, clr color.Color) image.Image { drawer := &font.Drawer{ Src: &image.Uniform{clr}, Face: face, diff --git a/examples/imageviewer/viewer.go b/examples/imageviewer/viewer.go index e7eb7c6..b70594e 100644 --- a/examples/imageviewer/viewer.go +++ b/examples/imageviewer/viewer.go @@ -23,7 +23,7 @@ func Viewer(env gui.Env, theme *Theme, view <-chan string) { } } - invalid := DrawText("Invalid image", theme.Face, theme.Text) + invalid := MakeTextImage("Invalid image", theme.Face, theme.Text) var ( r image.Rectangle -- cgit v1.2.3