Linting

systray/systray_windows.go

@@ -34,17 +34,18 @@ var (
 	s32              = windows.NewLazySystemDLL("Shell32.dll")
 	pShellNotifyIcon = s32.NewProc("Shell_NotifyIconW")
 
-	u32                    = windows.NewLazySystemDLL("User32.dll")
-	pCreateMenu            = u32.NewProc("CreateMenu")
-	pCreatePopupMenu       = u32.NewProc("CreatePopupMenu")
-	pCreateWindowEx        = u32.NewProc("CreateWindowExW")
-	pDefWindowProc         = u32.NewProc("DefWindowProcW")
-	pDeleteMenu            = u32.NewProc("DeleteMenu")
-	pDestroyWindow         = u32.NewProc("DestroyWindow")
-	pDispatchMessage       = u32.NewProc("DispatchMessageW")
-	pDrawIconEx            = u32.NewProc("DrawIconEx")
-	pGetCursorPos          = u32.NewProc("GetCursorPos")
-	pGetDC                 = u32.NewProc("GetDC")
+	u32              = windows.NewLazySystemDLL("User32.dll")
+	pCreateMenu      = u32.NewProc("CreateMenu")
+	pCreatePopupMenu = u32.NewProc("CreatePopupMenu")
+	pCreateWindowEx  = u32.NewProc("CreateWindowExW")
+	pDefWindowProc   = u32.NewProc("DefWindowProcW")
+	pDeleteMenu      = u32.NewProc("DeleteMenu")
+	pDestroyWindow   = u32.NewProc("DestroyWindow")
+	pDispatchMessage = u32.NewProc("DispatchMessageW")
+	pDrawIconEx      = u32.NewProc("DrawIconEx")
+	pGetCursorPos    = u32.NewProc("GetCursorPos")
+	pGetDC           = u32.NewProc("GetDC")
+	//lint:ignore U1000 keep pGetMenuItemID
 	pGetMenuItemID         = u32.NewProc("GetMenuItemID")
 	pGetMessage            = u32.NewProc("GetMessageW")
 	pGetSystemMetrics      = u32.NewProc("GetSystemMetrics")
@@ -716,6 +717,7 @@ func (t *winTray) delFromVisibleItems(parent, val uint32) {
 			break
 		}
 	}
+	t.visibleItems[parent] = visibleItems
 }
 
 func (t *winTray) addToVisibleItems(parent, val uint32) {

tools/tools.go

@@ -1,8 +1,8 @@
-// go:build tools
+//go:build tools
+// +build tools
 
 package tools
 
 import (
-	//  To keep go mod happy
 	_ "honnef.co/go/tools/cmd/staticcheck"
 )