Make piscope toolbar colors configurable

Users can now choose the toolbar background and foreground colors.

Author: elgopher

piscope/internal/gui.go

@@ -79,6 +79,13 @@ func attachIconButton(parent *pigui.Element, icon pi.Sprite, x int) *IconButton
 		if event.Pressed {
 			y = 1
 		}
+
+		prevColorTable := pi.ColorTables[0]
+		defer func() {
+			pi.ColorTables[0] = prevColorTable
+		}()
+		pi.Pal(0, *bgColor) // 0 is bg color in icons.png
+		pi.Pal(1, *fgColor) // 1 is fg color in icons.png
 		pi.Spr(iconBtn.Icon, 0, y)
 	}
 	return iconBtn

piscope/internal/icons.go

@@ -29,8 +29,14 @@ var icons = struct {
 }{}
 
 func init() {
-	// TODO Decode palette
+	prevPalette := pi.Palette
+	defer func() {
+		pi.Palette = prevPalette
+	}()
+
+	pi.Palette = pi.DecodePalette(iconsPNG)
 	iconsSheet := pi.DecodeCanvas(iconsPNG)
+
 	icons.AlignTop = pi.SpriteFrom(iconsSheet, 0, 0, 8, 8)
 	icons.AlignBottom = pi.SpriteFrom(iconsSheet, 8, 0, 8, 8)
 	icons.Screen = pi.SpriteFrom(iconsSheet, 16, 0, 8, 8)

piscope/internal/icons.png

@@ -14,7 +14,7 @@ import (
 	"github.com/elgopher/pi/pimouse"
 )
 
-var bgColor *pi.Color
+var bgColor, fgColor *pi.Color
 
 var consoleMode, pauseOnNextFrame bool
 
@@ -25,8 +25,9 @@ var consoleMode, pauseOnNextFrame bool
 // używać conajmniej 2 kolorów.
 //
 // Pressing Ctrl+Shift+I will activate the tools in the game
-func Start(backgroundColor *pi.Color) {
+func Start(backgroundColor, foregroundColor *pi.Color) {
 	bgColor = backgroundColor
+	fgColor = foregroundColor
 
 	// TODO Handle screen size change event and redraw entire gui.
 

piscope/internal/internal.go

@@ -9,7 +9,11 @@ import (
 	"github.com/elgopher/pi/piscope/internal"
 )
 
-var BgColor pi.Color = 8 // toolbar background color
+// Toolbar colors
+var (
+	BgColor pi.Color = 8 // toolbar background color
+	FgColor pi.Color = 1 // toolbar foreground color
+)
 
 // Start launches the developer tools.
 //
@@ -27,5 +31,5 @@ var BgColor pi.Color = 8 // toolbar background color
 // 128 pixels horizontally and 16 pixels vertically. Additionally, the game's
 // palette must use at least 2 colors.
 func Start() {
-	internal.Start(&BgColor)
+	internal.Start(&BgColor, &FgColor)
 }