Merge pull request magicmonkey#24 from magicmonkey/magicmonkey/issue22

Made a copy of the image returned by ImageFileButton so that subsequent changes don't pollute the original image.

Author: magicmonkey

buttons/imagefile.go

@@ -17,7 +17,10 @@ type ImageFileButton struct {
 }
 
 func (btn *ImageFileButton) GetImageForButton() image.Image {
-	return btn.img
+	// TODO base the 96 on the image bounds
+	newimg := image.NewRGBA(image.Rect(0, 0, 96, 96))
+	draw.Draw(newimg, newimg.Bounds(), btn.img, image.Point{0, 0}, draw.Src)
+	return newimg
 }
 
 func (btn *ImageFileButton) SetButtonIndex(btnIndex int) {
@@ -49,6 +52,7 @@ func (btn *ImageFileButton) loadImage() error {
 	var newimg *image.RGBA
 	newimg, ok := img.(*image.RGBA)
 	if !ok {
+		// TODO base the 96 on the button size
 		newimg = image.NewRGBA(image.Rect(0, 0, 96, 96))
 		draw.Draw(newimg, newimg.Bounds(), img, image.Point{0, 0}, draw.Src)
 	}

examples/client3/client3.go

@@ -0,0 +1,33 @@
+package main
+
+import (
+	"image/color"
+	"time"
+	streamdeck "github.com/magicmonkey/go-streamdeck"
+	"github.com/magicmonkey/go-streamdeck/buttons"
+	"github.com/magicmonkey/go-streamdeck/decorators"
+	_ "github.com/magicmonkey/go-streamdeck/devices"
+)
+
+func main() {
+
+	sd, err := streamdeck.New()
+	if err != nil {
+		panic(err)
+	}
+
+	btn1 := buttons.NewTextButton("Hello")
+	sd.AddButton(1, btn1)
+	btn2, _ := buttons.NewImageFileButton("examples/test/play.jpg")
+	sd.AddButton(2, btn2)
+
+
+	greenBorder := decorators.NewBorder(10, color.RGBA{0, 255, 0, 255})
+	sd.SetDecorator(1, greenBorder)
+	sd.SetDecorator(2, greenBorder)
+
+	time.Sleep(1 * time.Second)
+
+	sd.UnsetDecorator(1)
+	sd.UnsetDecorator(2)
+}

go.mod

@@ -4,7 +4,7 @@ go 1.13
 
 require (
 	github.com/disintegration/gift v1.2.1
-	github.com/disintegration/imaging v1.6.2
+	github.com/disintegration/imaging v1.6.2 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
 	github.com/karalabe/hid v1.0.1-0.20190806082151-9c14560f9ee8
 	golang.org/x/image v0.0.0-20200430140353-33d19683fad8