From 8d4f35352f21238c68f62a0c94c9d4563d5e7de5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Papp?= <zoltan.pmail@gmail.com>
Date: Thu, 21 May 2026 17:01:08 +0200
Subject: [PATCH] skip About-row brand mark on macOS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

NSMenuItem.setImage stretches the row to the leading image's pixel
size regardless of the surrounding rows, so any non-empty bitmap on
the About entry made it visibly taller than the rest of the tray
menu — leaving 16, 18 or 22 px versions all looking wrong next to
the unadorned rows above and below.

Drop the macOS brand mark and gate the SetBitmap call on a non-empty
byte slice; iconMenuNetbird is now nil on macOS, so the About row
falls back to text only. Windows and Linux still ship the brand mark
through their per-platform embed files.
---
 client/ui/assets/netbird-menu-22.png | Bin 687 -> 0 bytes
 client/ui/icons_menu_darwin.go       |  24 +++++++++++++-----------
 client/ui/tray.go                    |   6 +++++-
 3 files changed, 18 insertions(+), 12 deletions(-)
 delete mode 100644 client/ui/assets/netbird-menu-22.png

diff --git a/client/ui/assets/netbird-menu-22.png b/client/ui/assets/netbird-menu-22.png
deleted file mode 100644
index 87c6b599537515c7ef1d37eed3d76f3f1a2a15e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 687
zcmV;g0#N;lP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00009a7bBm000Um
z000Um0a2-`GXMYp8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10z64X
zK~y-6)s@dnR8bViKj+@({Bp+9Nx>u`+*OoG%N9ihLc978f)*{Jm75$gOE4&E)2ayC
z_7BWLY9&OJnl8dci^xQ*kx?5PXU6yLX<;Ke^F}Fh(cQg!zUOnl=bigQRF(Z0W?!iL
z3HJUbsWRGk%=h)2h;-M+L@37m4<mmBUcG;^HL_uzA#zy+fsp<vcNkLVt=;QAZpHMg
z=n3O!SJ5;`31wA;?+%?539|7-YANE|*9fO~S$i%P*arZfab_8-*G1`30g&G{ZTb=9
z8tQ5BYttf0zf&R`jj^f&3{4aPL{%w`oI0wQaiA+yU-9r~j{so1moTk`Fxi`UX8J5_
z?q35C%glVXn2SIzEF)NGL!F>b@V~U<RuZ)mry@72&@C`PBr`dy#`O!V?r{4vhFeK)
zn*e{V1AMzRCGb2kI5n|7Z^u4P+?ttEG5x?=HN~G#*Ec^f1i6;#S0M<RZr7GjcR=EU
zlWz@r1t<sk6k3edN&s;AY85ivJoIjHPcT3<Gd(8CRkv_36bhh~CbaC$#}5>qgvA>k
zX%%|S;pMH}7phs0z2wHHa#&2lZnyHtnI1>*5s1263;z6}dPk}Cjns>5q|u_Gjvc`x
zAPQjGe_%WFHFm(X6$TpD65_aYx9@@)eN`(A7TO5DZT@qcF65F=$2xWc@4SSD&wE%N
zhY4+G9t{j`xf$0|xwIR!4qUeR9>r!svUN%UuPbj{q7-R<IR1VwaA@=X#rXf8reAcf
V))F@Bg&_a{002ovPDHLkV1l!GEtCKN

diff --git a/client/ui/icons_menu_darwin.go b/client/ui/icons_menu_darwin.go
index 464e67096..29fe2d894 100644
--- a/client/ui/icons_menu_darwin.go
+++ b/client/ui/icons_menu_darwin.go
@@ -4,20 +4,22 @@ package main
 
 import _ "embed"
 
-// 22x22 menu-row icons used on macOS. Apple's HIG recommends an 18–22 px
-// glyph for NSMenuItem leading images; 22 sits at the top of that range
-// and matches the visual weight of the surrounding row text. Windows
-// ships a 16x16 variant (Win32 SM_CXMENUCHECK slot) and Linux a 24x24
-// variant (GTK menu row supports the larger range) — see the sibling
-// icons_menu_*.go files.
+// 22x22 status dot icons used on macOS. Apple's HIG recommends an
+// 18–22 px glyph for NSMenuItem leading images; 22 matches the visual
+// weight of the surrounding row text. Windows ships a 16x16 variant
+// (Win32 SM_CXMENUCHECK slot) and Linux a 24x24 variant (GTK menu row
+// supports the larger range) — see the sibling icons_menu_*.go files.
+//
+// iconMenuNetbird is intentionally empty on macOS. NSMenuItem.setImage
+// stretches the row height to the leading image's pixel size, which
+// makes the About row taller than the unadorned rows above and below
+// it regardless of the PNG size we ship. The brand mark is rendered
+// only on Windows and Linux (see those platforms' icons_menu_*.go
+// files); on macOS the About row stays text-only — the tray icon
+// itself already supplies the brand presence.
 //
-// Regenerate the brand mark from assets/svg/netbird-menu.svg (vector
-// source — re-rendering keeps the strokes crisp at every target size):
-//   inkscape assets/svg/netbird-menu.svg -o netbird-menu-22.png -w 22 -h 22 \
-//     --export-background-opacity=0
 // Status dots are downscaled from the 24x24 originals with ImageMagick.
 
-//go:embed assets/netbird-menu-22.png
 var iconMenuNetbird []byte
 
 //go:embed assets/netbird-menu-dot-connected-22.png
diff --git a/client/ui/tray.go b/client/ui/tray.go
index f28aa4a83..62a75d171 100644
--- a/client/ui/tray.go
+++ b/client/ui/tray.go
@@ -383,7 +383,11 @@ func (t *Tray) buildMenu() *application.Menu {
 
 	aboutLabel := t.loc.T("tray.menu.about")
 	about := menu.AddSubmenu(aboutLabel)
-	if aboutItem := menu.FindByLabel(aboutLabel); aboutItem != nil {
+	// iconMenuNetbird is empty on macOS — NSMenuItem.setImage stretches
+	// the row to the leading image's pixel size, and the result looks
+	// out of place next to the unadorned rows above and below. Skip the
+	// brand mark there and keep the row text-only.
+	if aboutItem := menu.FindByLabel(aboutLabel); aboutItem != nil && len(iconMenuNetbird) > 0 {
 		aboutItem.SetBitmap(iconMenuNetbird)
 	}
 	about.Add(t.loc.T("tray.menu.github")).OnClick(func(*application.Context) {