From d8be27d86e8c8068f08b7e7cef8a2f255b1714fd Mon Sep 17 00:00:00 2001
From: lawl <github@dumbinter.net>
Date: Sun, 13 Dec 2020 06:28:00 +0100
Subject: [PATCH] Make patreon call to action look nicer

---
 .gitignore                                    |   3 +-
 assets/patreon.png                            | Bin 0 -> 3410 bytes
 main.go                                       |   3 +-
 .../{embedlibrnnoise.go => embedbinary.go}    |  11 +++--
 ui.go                                         |  44 +++++++++++++++---
 5 files changed, 49 insertions(+), 12 deletions(-)
 create mode 100644 assets/patreon.png
 rename scripts/{embedlibrnnoise.go => embedbinary.go} (59%)

diff --git a/.gitignore b/.gitignore
index cf9dfb4..0253e55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 bin/
 librnnoise.go
 version.go
-licenses.go
\ No newline at end of file
+licenses.go
+patreon.go
diff --git a/assets/patreon.png b/assets/patreon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a48aa87b4b8bd1c48fba9c8b8ba5ba35b17d7db
GIT binary patch
literal 3410
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

literal 0
HcmV?d00001

diff --git a/main.go b/main.go
index a46e7e7..d83002b 100644
--- a/main.go
+++ b/main.go
@@ -19,7 +19,8 @@ import (
 	"github.com/aarzilli/nucular/style"
 )
 
-//go:generate go run scripts/embedlibrnnoise.go
+//go:generate go run scripts/embedbinary.go librnnoise_ladspa/bin/ladspa/librnnoise_ladspa.so librnnoise.go libRNNoise
+//go:generate go run scripts/embedbinary.go assets/patreon.png patreon.go patreonPNG
 //go:generate go run scripts/embedversion.go
 //go:generate go run scripts/embedlicenses.go
 
diff --git a/scripts/embedlibrnnoise.go b/scripts/embedbinary.go
similarity index 59%
rename from scripts/embedlibrnnoise.go
rename to scripts/embedbinary.go
index 43daf80..1f11ce4 100644
--- a/scripts/embedlibrnnoise.go
+++ b/scripts/embedbinary.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"flag"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -8,15 +9,17 @@ import (
 )
 
 func main() {
-	b, err := ioutil.ReadFile("librnnoise_ladspa/bin/ladspa/librnnoise_ladspa.so")
+	flag.Parse()
+	args := flag.Args()
+	b, err := ioutil.ReadFile(args[0])
 	if err != nil {
-		fmt.Printf("Couldn't read librnnoise_ladspa.so: %v\n", err)
+		fmt.Printf("Couldn't read '%s': %v\n", args[0], err)
 		os.Exit(1)
 	}
-	out, _ := os.Create("librnnoise.go")
+	out, _ := os.Create(args[1])
 	defer out.Close()
 
-	out.Write([]byte("package main \n\n//THIS FILE IS AUTOMATICALLY GENERATED BY `go generate` DO NOT EDIT!\n\nvar libRNNoise = []byte{\n"))
+	out.Write([]byte("package main \n\n//THIS FILE IS AUTOMATICALLY GENERATED BY `go generate` DO NOT EDIT!\n\nvar " + args[2] + " = []byte{\n"))
 	for i, c := range b {
 		out.Write([]byte(strconv.Itoa(int(c))))
 		out.Write([]byte(","))
diff --git a/ui.go b/ui.go
index 53d5133..d4c51c2 100644
--- a/ui.go
+++ b/ui.go
@@ -1,8 +1,12 @@
 package main
 
 import (
+	"bytes"
 	"fmt"
+	"image"
 	"image/color"
+	"image/draw"
+	"image/png"
 	"log"
 	"os/exec"
 	"time"
@@ -33,6 +37,8 @@ var green = color.RGBA{34, 187, 69, 255}
 var red = color.RGBA{255, 70, 70, 255}
 var orange = color.RGBA{255, 140, 0, 255}
 
+var patreonImg *image.RGBA
+
 func updatefn(ctx *ntcontext, w *nucular.Window) {
 
 	if !ctx.paClient.Connected() {
@@ -57,7 +63,7 @@ func updatefn(ctx *ntcontext, w *nucular.Window) {
 
 	w.MenubarBegin()
 
-	w.Row(10).Dynamic(2)
+	w.Row(10).Dynamic(1)
 	if w := w.Menu(label.TA("About", "LC"), 120, nil); w != nil {
 		w.Row(10).Dynamic(1)
 		if w.MenuItem(label.T("Licenses")) {
@@ -71,13 +77,17 @@ func updatefn(ctx *ntcontext, w *nucular.Window) {
 			ctx.versionScreen = true
 		}
 	}
-	if w := w.Menu(label.TA("Support NoiseTorch on PATREON", "RC"), 120, nil); w != nil {
-		exec.Command("xdg-open", "https://patreon.com/lawl").Run()
-		w.Close()
-	}
+
 	w.MenubarEnd()
 
-	w.Row(15).Dynamic(1)
+	w.Row(25).Dynamic(2)
+	if patreonImg == nil {
+		patreonImg = loadPatreonImg()
+	}
+
+	if imageButton(w, patreonImg) {
+		exec.Command("xdg-open", "https://patreon.com/lawl").Run()
+	}
 
 	if ctx.noiseSupressorState == loaded {
 		w.LabelColored("NoiseTorch active", "RC", green)
@@ -284,3 +294,25 @@ func resetUI(ctx *ntcontext) {
 		(*ctx.masterWindow).Changed()
 	}
 }
+
+func loadPatreonImg() *image.RGBA {
+	var pat *image.RGBA
+	img, _ := png.Decode(bytes.NewReader(patreonPNG))
+	pat = image.NewRGBA(img.Bounds())
+	draw.Draw(pat, img.Bounds(), img, image.Point{}, draw.Src)
+	return pat
+}
+
+func imageButton(w *nucular.Window, img *image.RGBA) bool {
+	style := w.Master().Style()
+	origButtonStyle := style.Button
+	style.Button.Border = 0
+	style.Button.Normal.Data.Color = style.NormalWindow.Background
+	style.Button.Hover.Data.Color = style.NormalWindow.Background
+	style.Button.Active.Data.Color = style.NormalWindow.Background
+
+	defer (func() { style.Button = origButtonStyle })()
+
+	return w.Button(label.I(patreonImg), false)
+
+}