From 1e8bb56b7c493ac04f0861807df18c253f5306be Mon Sep 17 00:00:00 2001
From: Sasha Koshka <sashakoshka@tebibyte.media>
Date: Sat, 4 Mar 2023 22:07:59 -0500
Subject: [PATCH] Added small icons to default theme

---
 theme/assets/wintergreen-icons-small.png | Bin 1752 -> 1832 bytes
 theme/default.go                         |  76 ++++++++++++++++++++++-
 theme/theme.go                           |  19 +++---
 theme/wrapped.go                         |   4 +-
 4 files changed, 86 insertions(+), 13 deletions(-)

diff --git a/theme/assets/wintergreen-icons-small.png b/theme/assets/wintergreen-icons-small.png
index cd65704ed14d81d174b1d70dcc5fce8f457143a1..a6ebc9318b764fa3ce170fc3b227d03695de8114 100644
GIT binary patch
literal 1832
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
W<@b!IP;u4(0000<MNUMnLSTXi$6zS{

literal 1752
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

diff --git a/theme/default.go b/theme/default.go
index 304b77e..8c25519 100644
--- a/theme/default.go
+++ b/theme/default.go
@@ -16,6 +16,9 @@ import "git.tebibyte.media/sashakoshka/tomo/artist/patterns"
 var defaultAtlasBytes []byte
 var defaultAtlas      canvas.Canvas
 var defaultTextures   [14][9]artist.Pattern
+//go:embed assets/wintergreen-icons-small.png
+var defaultIconsSmallAtlasBytes []byte
+var defaultIconsSmall [640]binaryIcon
 
 func atlasCell (col, row int, border artist.Inset) {
 	bounds := image.Rect(0, 0, 16, 16).Add(image.Pt(col, row).Mul(16))
@@ -31,6 +34,51 @@ func atlasCol (col int, border artist.Inset) {
 	}
 }
 
+type binaryIcon struct {
+	data   []bool
+	stride int
+}
+
+func (icon binaryIcon) Draw (destination canvas.Canvas, color color.RGBA, at image.Point) {
+	bounds := icon.Bounds().Add(at).Intersect(destination.Bounds())
+	point := image.Point { }
+	data, stride := destination.Buffer()
+
+	for point.Y = bounds.Min.Y; point.Y < bounds.Max.Y; point.Y ++ {
+	for point.X = bounds.Min.X; point.X < bounds.Max.X; point.X ++ {
+		srcPoint := point.Sub(at)
+		srcIndex := srcPoint.X + srcPoint.Y * icon.stride
+		dstIndex := point.X + point.Y * stride
+		if icon.data[srcIndex] {
+			data[dstIndex] = color
+		}
+	}}
+}
+
+func (icon binaryIcon) Bounds () image.Rectangle {
+	return image.Rect(0, 0, icon.stride, len(icon.data) / icon.stride)
+}
+
+func binaryIconFrom (source image.Image, clip image.Rectangle) (icon binaryIcon) {
+	bounds := source.Bounds().Intersect(clip)
+	if bounds.Empty() { return }
+	
+	icon.stride = bounds.Dx()
+	icon.data   = make([]bool, bounds.Dx() * bounds.Dy())
+
+	point    := image.Point { }
+	dstIndex := 0
+	for point.Y = bounds.Min.Y; point.Y < bounds.Max.Y; point.Y ++ {
+	for point.X = bounds.Min.X; point.X < bounds.Max.X; point.X ++ {
+		r, g, b, a := source.At(point.X, point.Y).RGBA()
+		if a > 0x8000 && (r + g + b) / 3 < 0x8000 {
+			icon.data[dstIndex] = true
+		}
+		dstIndex ++
+	}}
+	return
+}
+
 func init () {
 	defaultAtlasImage, _, _ := image.Decode(bytes.NewReader(defaultAtlasBytes))
 	defaultAtlas = canvas.FromImage(defaultAtlasImage)
@@ -64,6 +112,20 @@ func init () {
 	atlasCol(11, artist.Inset { 3, 3, 5, 3 })
 	// PatternRaised: fun.sharpKey
 	atlasCol(12, artist.Inset { 3, 3, 4, 3 })
+
+	// set up small icons
+	defaultIconsSmallAtlasImage, _, _ := image.Decode (
+		bytes.NewReader(defaultIconsSmallAtlasBytes))
+	bounds    := defaultIconsSmallAtlasImage.Bounds()
+	point     := image.Point { }
+	iconIndex := 0
+	for point.Y = bounds.Min.Y; point.Y < bounds.Max.Y; point.Y += 16 {
+	for point.X = bounds.Min.X; point.X < bounds.Max.X; point.X += 16 {
+		defaultIconsSmall[iconIndex] = binaryIconFrom (
+			defaultIconsSmallAtlasImage,
+			image.Rect(0, 0, 16, 16).Add(point))
+		iconIndex ++
+	}}
 }
 
 // Default is the default theme.
@@ -84,9 +146,17 @@ func (Default) FontFace (style FontStyle, size FontSize, c Case) font.Face {
 }
 
 // Icon returns an icon from the default set corresponding to the given name.
-func (Default) Icon (string, IconSize, Case) artist.Icon {
-	// TODO
-	return nil
+func (Default) Icon (id Icon, size IconSize, c Case) artist.Icon {
+	if size == IconSizeLarge {
+		// TODO
+		return nil
+	} else {
+		if id < 0 || int(id) >= len(defaultIconsSmall) {
+			return nil
+		} else {
+			return defaultIconsSmall[id]
+		}
+	}
 }
 
 // MimeIcon returns an icon from the default set corresponding to the given mime.
diff --git a/theme/theme.go b/theme/theme.go
index f3341ab..2db0276 100644
--- a/theme/theme.go
+++ b/theme/theme.go
@@ -78,10 +78,11 @@ type Icon int; const (
 	IconLibraries
 	IconDownloads
 	IconRepositories
-	IconSettings
+	IconSettings)
 
+const (
 	// Object icons
-	IconFile = iota + 0x80
+	IconFile Icon = iota + 0x80
 	IconDirectory
 	IconPopulatedDirectory
 	
@@ -127,8 +128,9 @@ type Icon int; const (
 	IconParallelPort
 	IconSerialPort
 	IconPS2Port
-	IconMonitorPort
+	IconMonitorPort)
 
+const (
 	// Action icons
 	IconOpen = iota + 0x100
 	IconSave
@@ -166,17 +168,18 @@ type Icon int; const (
 	IconHistory
 
 	IconYes
-	IconNo
+	IconNo)
 
+const (
 	// Status icons
 	IconInformation = iota + 0x180
 	IconQuestion
 	IconWarning
-	IconError
+	IconError)
 
+const (
 	// Tool icons
-	
-)
+	)
 
 // Hints specifies rendering hints for a particular pattern. Elements can take
 // these into account in order to gain extra performance.
@@ -197,7 +200,7 @@ type Theme interface {
 	FontFace (FontStyle, FontSize, Case) font.Face
 
 	// Icon returns an appropriate icon given an icon name, size, and case.
-	Icon (string, IconSize, Case) artist.Icon
+	Icon (Icon, IconSize, Case) artist.Icon
 	
 	// Icon returns an appropriate icon given a file mime type, size, and,
 	// case.
diff --git a/theme/wrapped.go b/theme/wrapped.go
index a2c8706..f535dcb 100644
--- a/theme/wrapped.go
+++ b/theme/wrapped.go
@@ -21,9 +21,9 @@ func (wrapped Wrapped) FontFace (style FontStyle, size FontSize) font.Face {
 }
 
 // Icon returns an appropriate icon given an icon name.
-func (wrapped Wrapped) Icon (name string, size IconSize) artist.Icon {
+func (wrapped Wrapped) Icon (id Icon, size IconSize) artist.Icon {
 	real := wrapped.ensure()
-	return real.Icon(name, size, wrapped.Case)
+	return real.Icon(id, size, wrapped.Case)
 }
 
 // MimeIcon returns an appropriate icon given file mime type.