refactor(tray): unify tray and menu updates

Author: Ayideyia

bridge/tray.go

@@ -29,14 +29,26 @@ func CreateTray(a *App, icon []byte) (trayStart, trayEnd func()) {
 	}, nil)
 }
 
+func (a *App) UpdateTray(tray TrayContent) {
+	log.Printf("UpdateTray")
+	updateTray(a, tray)
+}
+
 func (a *App) UpdateTrayMenus(menus []MenuItem) {
 	log.Printf("UpdateTrayMenus")
+	updateTrayMenus(a, menus)
+}
 
-	systray.ResetMenu()
+func (a *App) UpdateTrayAndMenus(tray TrayContent, menus []MenuItem) {
+	log.Printf("UpdateTrayAndMenus")
+	updateTray(a, tray)
+	updateTrayMenus(a, menus)
+}
 
-	for _, menu := range menus {
-		createMenuItem(menu, a, nil)
-	}
+func (a *App) ExitApp() {
+	systray.Quit()
+	runtime.Quit(a.Ctx)
+	os.Exit(0)
 }
 
 func addClickMenuItem(title, tooltip string, action func()) *systray.MenuItem {
@@ -72,7 +84,7 @@ func createMenuItem(menu MenuItem, a *App, parent *systray.MenuItem) {
 	}
 }
 
-func (a *App) UpdateTray(tray TrayContent) {
+func updateTray(a *App, tray TrayContent) {
 	if tray.Icon != "" {
 		ico, err := os.ReadFile(GetPath(tray.Icon))
 		if err == nil {
@@ -88,8 +100,10 @@ func (a *App) UpdateTray(tray TrayContent) {
 	}
 }
 
-func (a *App) ExitApp() {
-	systray.Quit()
-	runtime.Quit(a.Ctx)
-	os.Exit(0)
+func updateTrayMenus(a *App, menus []MenuItem) {
+	systray.ResetMenu()
+
+	for _, menu := range menus {
+		createMenuItem(menu, a, nil)
+	}
 }

bridge/types.go

@@ -82,9 +82,9 @@ type AppConfig struct {
 }
 
 type TrayContent struct {
-	Icon    string `json:"icon"`
-	Title   string `json:"title"`
-	Tooltip string `json:"tooltip"`
+	Icon    string `json:"icon,omitempty"`
+	Title   string `json:"title,omitempty"`
+	Tooltip string `json:"tooltip,omitempty"`
 }
 
 type WriteTracker struct {

frontend/src/bridge/app.ts

@@ -1,20 +1,17 @@
 import * as App from '@wails/go/bridge/App'
 
-import type { TrayContent } from '@/types/app'
-
 export const RestartApp = App.RestartApp
 
 export const ExitApp = App.ExitApp
 
 export const ShowMainWindow = App.ShowMainWindow
 
-export const UpdateTray = async (tray: TrayContent) => {
-  const { icon = '', title = '', tooltip = '' } = tray
-  await App.UpdateTray({ icon, title, tooltip })
-}
+export const UpdateTray = App.UpdateTray
 
 export const UpdateTrayMenus = App.UpdateTrayMenus
 
+export const UpdateTrayAndMenus = App.UpdateTrayAndMenus
+
 export const GetEnv = App.GetEnv
 
 export const IsStartup = App.IsStartup

frontend/src/bridge/wailsjs/go/bridge/App.d.ts

@@ -70,6 +70,8 @@ export function UnzipZIPFile(arg1:string,arg2:string):Promise<bridge.FlagResult>
 
 export function UpdateTray(arg1:bridge.TrayContent):Promise<void>;
 
+export function UpdateTrayAndMenus(arg1:bridge.TrayContent,arg2:Array<bridge.MenuItem>):Promise<void>;
+
 export function UpdateTrayMenus(arg1:Array<bridge.MenuItem>):Promise<void>;
 
 export function Upload(arg1:string,arg2:string,arg3:string,arg4:Record<string, string>,arg5:string,arg6:bridge.RequestOptions):Promise<bridge.HTTPResult>;

frontend/src/bridge/wailsjs/go/bridge/App.js

@@ -138,6 +138,10 @@ export function UpdateTray(arg1) {
   return window['go']['bridge']['App']['UpdateTray'](arg1);
 }
 
+export function UpdateTrayAndMenus(arg1, arg2) {
+  return window['go']['bridge']['App']['UpdateTrayAndMenus'](arg1, arg2);
+}
+
 export function UpdateTrayMenus(arg1) {
   return window['go']['bridge']['App']['UpdateTrayMenus'](arg1);
 }

frontend/src/bridge/wailsjs/go/models.ts

@@ -185,9 +185,9 @@ export namespace bridge {
 	    }
 	}
 	export class TrayContent {
-	    icon: string;
-	    title: string;
-	    tooltip: string;
+	    icon?: string;
+	    title?: string;
+	    tooltip?: string;
 
 	    static createFrom(source: any = {}) {
 	        return new TrayContent(source);

frontend/src/stores/appSettings.ts

@@ -32,7 +32,7 @@ import {
   Branch,
 } from '@/enums/app'
 import i18n, { loadLocaleMessages, reloadLocale } from '@/lang'
-import { debounce, updateTrayMenus, ignoredError, sleep, GetSystemProxyBypass } from '@/utils'
+import { debounce, updateTrayAndMenus, ignoredError, sleep, GetSystemProxyBypass } from '@/utils'
 
 import { useEnvStore } from './env'
 
@@ -233,7 +233,7 @@ export const useAppSettingsStore = defineStore('app-settings', () => {
       () => app.value.lang,
       () => app.value.addPluginToMenu,
     ],
-    updateTrayMenus,
+    updateTrayAndMenus,
   )
   watch(themeMode, setAppTheme, { immediate: true })
 

frontend/src/stores/env.ts

@@ -3,7 +3,7 @@ import { ref, watch } from 'vue'
 
 import { GetEnv } from '@/bridge'
 import { useAppSettingsStore, useKernelApiStore } from '@/stores'
-import { updateTrayMenus } from '@/utils'
+import { updateTrayAndMenus } from '@/utils'
 import { SetSystemProxy, GetSystemProxy } from '@/utils'
 
 export const useEnvStore = defineStore('env', () => {
@@ -75,7 +75,7 @@ export const useEnvStore = defineStore('env', () => {
     else await clearSystemProxy()
   }
 
-  watch(systemProxy, updateTrayMenus)
+  watch(systemProxy, updateTrayAndMenus)
 
   return {
     env,

frontend/src/stores/kernelApi.ts

@@ -27,7 +27,7 @@ import {
 } from '@/stores'
 import {
   generateConfigFile,
-  updateTrayMenus,
+  updateTrayAndMenus,
   getKernelFileName,
   message,
   getKernelRuntimeArgs,
@@ -326,7 +326,7 @@ export const useKernelApiStore = defineStore('kernelApi', () => {
     return source.concat([proxySignature, unAvailable, sortByDelay]).join('')
   })
 
-  watch([watchSources, running], updateTrayMenus)
+  watch([watchSources, running], updateTrayAndMenus)
 
   return {
     startCore,

frontend/src/stores/plugins.ts

@@ -10,7 +10,7 @@ import {
   omitArray,
   ignoredError,
   isNumber,
-  updateTrayMenus,
+  updateTrayAndMenus,
   stringifyNoFolding,
   deepClone,
   confirm,
@@ -512,7 +512,7 @@ export const usePluginsStore = defineStore('plugins', () => {
 
   watch([_watchMenus, _watchDisabled], () => {
     if (appSettingsStore.app.addPluginToMenu) {
-      updateTrayMenus()
+      updateTrayAndMenus()
     }
   })