From b91468b6f27c6fb282eaf09b425a557fdc2d6852 Mon Sep 17 00:00:00 2001
From: Lea Anthony <lea.anthony@gmail.com>
Date: Tue, 9 May 2023 21:38:38 +1000
Subject: [PATCH] [v3 mac] Update api. New template icon.

---
 v3/examples/systray/main.go                 |   2 +-
 v3/internal/commands/icons.go               |  38 ++++++++++++++++++++
 v3/pkg/application/systemtray_darwin.go     |   4 +++
 v3/pkg/application/webview_window_darwin.go |   4 +++
 v3/pkg/icons/DefaultMacTemplateIcon.png     | Bin 1142 -> 669 bytes
 5 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/v3/examples/systray/main.go b/v3/examples/systray/main.go
index c6e8d282a..a8a27f878 100644
--- a/v3/examples/systray/main.go
+++ b/v3/examples/systray/main.go
@@ -30,7 +30,7 @@ func main() {
 
 	systemTray := app.NewSystemTray()
 	if runtime.GOOS == "darwin" {
-		systemTray.SetIcon(icons.SystrayMacTemplate)
+		systemTray.SetTemplateIcon(icons.SystrayMacTemplate)
 	}
 
 	myMenu := app.NewMenu()
diff --git a/v3/internal/commands/icons.go b/v3/internal/commands/icons.go
index 4eee8734f..f4fcf7a7c 100644
--- a/v3/internal/commands/icons.go
+++ b/v3/internal/commands/icons.go
@@ -4,6 +4,8 @@ import (
 	"bytes"
 	"fmt"
 	"image"
+	"image/color"
+	"image/png"
 	"os"
 	"strconv"
 	"strings"
@@ -124,3 +126,39 @@ func generateWindowsIcon(iconData []byte, sizes []int, options *IconsOptions) er
 	}
 	return nil
 }
+
+func GenerateTemplateIcon(data []byte, outputFilename string) error {
+	// Decode the input file as a PNG
+	buffer := bytes.NewBuffer(data)
+	img, err := png.Decode(buffer)
+	if err != nil {
+		return fmt.Errorf("failed to decode input file as PNG: %w", err)
+	}
+
+	// Create a new image with the same dimensions and RGBA color model
+	bounds := img.Bounds()
+	iconImg := image.NewRGBA(bounds)
+
+	// Iterate over each pixel of the input image
+	for y := bounds.Min.Y; y < bounds.Max.Y; y++ {
+		for x := bounds.Min.X; x < bounds.Max.X; x++ {
+			// Get the alpha of the pixel
+			_, _, _, a := img.At(x, y).RGBA()
+			iconImg.SetRGBA(x, y, color.RGBA{R: 0, G: 0, B: 0, A: uint8(a)})
+		}
+	}
+
+	// Create the output file
+	outFile, err := os.Create(outputFilename)
+	if err != nil {
+		return fmt.Errorf("failed to create output file: %w", err)
+	}
+	defer outFile.Close()
+
+	// Encode the template icon image as a PNG and write it to the output file
+	if err := png.Encode(outFile, iconImg); err != nil {
+		return fmt.Errorf("failed to encode output image as PNG: %w", err)
+	}
+
+	return nil
+}
diff --git a/v3/pkg/application/systemtray_darwin.go b/v3/pkg/application/systemtray_darwin.go
index f5a464341..1c6750185 100644
--- a/v3/pkg/application/systemtray_darwin.go
+++ b/v3/pkg/application/systemtray_darwin.go
@@ -91,6 +91,10 @@ type macosSystemTray struct {
 	isTemplateIcon bool
 }
 
+func (s *macosSystemTray) setDarkModeIcon(icon []byte) {
+	// Is this even possible?
+}
+
 func (s *macosSystemTray) setIconPosition(position int) {
 	s.iconPosition = position
 }
diff --git a/v3/pkg/application/webview_window_darwin.go b/v3/pkg/application/webview_window_darwin.go
index 60305c49a..ed39aa927 100644
--- a/v3/pkg/application/webview_window_darwin.go
+++ b/v3/pkg/application/webview_window_darwin.go
@@ -808,6 +808,10 @@ type macosWebviewWindow struct {
 	parent   *WebviewWindow
 }
 
+func (w *macosWebviewWindow) focus() {
+	//TODO implement me
+}
+
 func (w *macosWebviewWindow) openContextMenu(menu *Menu, data *ContextMenuData) {
 	// Create the menu
 	thisMenu := newMenuImpl(menu)
diff --git a/v3/pkg/icons/DefaultMacTemplateIcon.png b/v3/pkg/icons/DefaultMacTemplateIcon.png
index 2c3fb9f86e2a3a37d0632e51dc933eadda8328ee..ee8ad23524f32e67189acdc3fa1e014f7cb70b13 100644
GIT binary patch
delta 552
zcmV+@0@wZa2%QCxBn4nlOjJdYF<^iCPw0&R001C#QchC<;S3N58c!A6T|#9_hOjou
zy>=qgm2Rh@eO4{TnvW@VDsp!K00GQNL_t(o!|m4Fa)K}r2H<5u1IQUU2p-=5En8rB
zHnE)~j2Cq}{x`Uge1rrL_~f4jcO?4RJyaq3CsYV#Xon^C4j97TC`;uPG=_h0*bhYE
zn*!yLGOue(#d^5qL#Yku0?K8n5-N^Mapyz11&~(FQVmpOOHuKm(gx(*>a<)ztN{-`
za<$IEg_|Yc#WB!;lZ?#<G~8_B31ML5;$a1Ptxt5;3%;D%x{NZ=6d(;Wpyc1Z9Z0mP
z&IQn}?O+EcZa34q@o)<IS%7~X$hc1nb0C1MXyO1;8EK;f49Ch2$Xp@RI>7TWf-eB=
zx~T}b@>Agg9z0Z9(0l`0-i<DRTb{RRuaXVm)$PCq9QcV*@j3tkZaf)IAmkf%(odb9
zX<U&LK)zpYTZawk<yGPWqL_en+tIB(@cr!ufPih25kNaD@Brv)Y0-ZOpj>=_Dv*p|
z0<#ZL2a?1DYS;<H$^?2ZppXs)y`ea*7cfYN69epd0i$`wljivWojGR$#L5r22b{(P
z2Ji#qRa~0D<Oj%qTLlIXqaPrz(%b}Y;0g5dA~k@_1;~ENQ~CBES?Uh}#8<zSU;J7R
q@flROC%>F9LJWO_2%i|dQ@#L#)DqQDlqmE70000<MNUMnLSTYOYxV2^

delta 962
zcmV;z13mnm1@;J#Bn7BYOjJdYF<6m6Ns&MYe=Offh5!HnICN4@Qvl%z4hrPw5f{@0
z+Y`-F>elSp-AlQ#ZD>y=zK2He%B*`rr-Ec(E{<3m#iEvWIUkX8a6L6DngvC{y8r+K
zMM*?KR9M5U*XeqqFcb#hLr6dn1Vm64tEhF~YPG%pI~$f0gbvFL_WR-UoW#5&C`;g%
ze?mG$1s+utWwA?WW~fvaX@?n5QO*QWR=X}-6O&Jw0(2GtK%>w(sz?EPuK-kh4FDp)
z2vDsA5JEA8|H9>xP#zV5(hSJO8(<dKbimgxD@S`ZDgC_P+f)JChi)oqhVv1`@xy*v
znuifd`op~6-Bkg-Z$ZjpIUd9rIaXR4e?u<;_5s8Gw`KJVwtXg~G2AJ{`LwfIQc_@J
z3m7AUN+8UE`90~~z6l5<OAvPwj%WI=5|CFz4lFNmeVH3Y;2JVMfzzfMh;rcgi0jEr
zDgqBzz*rMn4V*b(9lzrGlocG93OvdJDgkkv1K&Qt-ZhE<dAG1+F<%Y5=fLR-f8ZTT
zfFI`NTC4`>ItM;_0HMN)z`~WV>~Ek3*qI#I%Ah()fxwi&ntS%VR|61_18*ULFI_4C
zDnxh+*l;4&0n;2<0i9rh!2V?M!iPFwQ2^v+KPeajFvZ`5*>h3{sP`N=gRi9P9dcl-
z<8`5bLM?E~flnAQmaNyY5%|C^e<Rq`0~<xcZ%ybbo$qYbX9=*_&-p1>LM;Ga9FX3x
zLAnBWjljq;a0Rypz~_Lyez4@*vsDJ@i)bd{g??!O_6RWZwzksyiif~`-e>q9B@KYa
zf!TH|rPtK;JsHRpZ^n=wLjxdlAXqxdI3a=zFe8QGo#x&IP@MyZ^n?Wie>DU8^C7Mv
z(wYDjCo1&q?4tHb0>l{#m;p2bhYY}2HxMTofMM>V83>BwnKJkZ80TIy;1mIA`9R>A
z1vCS$%}R&+2{?WWuq*=72+9Dn&sqy`EFSN$0g%Tf;G(tw-@^j1-TwgWK!X<G^aPkN
zpk;uWE7AsR&FAq<AIg9<e_N<+!1GbSY*+jVI277|)e|sp6oI@YgjOKR0ZG5BWxxnV
z?Z7R6n6MyimOpdAI?C<9m;=oGfHJ`P5wrsn#lp9!*)9Xl%)l1M`v+j>D0&+6=;IUr
zpkqsTZ3lqJ8b<u9g+M*fJ+A}WFTCz+<h2dQ>suZolNUB!FK+u}EHRshERrsX$Em=D
k?pt5J8T$Xx1b!ud0ANW*CqJf#SpWb407*qoM6N<$f-%akoB#j-