taigrr/wails
1
0
Fork 0
mirror of https://github.com/taigrr/wails.git synced 2026-04-02 05:08:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Tray menu support

Browse Source 
Bugfix move after tray use
Refactored options to handle default tray/menu
This commit is contained in:
Lea Anthony
2020-12-10 07:16:10 +11:00
parent 0802d0d57a
commit b837b1e131
19 changed files with 311 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
v2/internal/ffenestri/ffenestri_darwin.go
View File

@@ -20,6 +20,7 @@ extern void SetTray(void *, const char *);
import "C"
import (
"encoding/json"
"github.com/wailsapp/wails/v2/pkg/options"
)
func (a *Application) processPlatformSettings() error {
@@ -71,7 +72,8 @@ func (a *Application) processPlatformSettings() error {
}
// Process menu
if mac.Menu != nil {
applicationMenu := options.GetApplicationMenu(a.config)
if applicationMenu != nil {
/*
As radio groups need to be manually managed on OSX,
@@ -81,7 +83,7 @@ func (a *Application) processPlatformSettings() error {
a list of all members of the group and the number of members
in the group (this last one is for optimisation at the C layer).
*/
processedMenu := NewProcessedMenu(mac.Menu)
processedMenu := NewProcessedMenu(applicationMenu)
applicationMenuJSON, err := json.Marshal(processedMenu)
if err != nil {
return err
@@ -90,7 +92,8 @@ func (a *Application) processPlatformSettings() error {
}
// Process tray
if mac.Tray != nil {
tray := options.GetTrayMenu(a.config)
if tray != nil {
/*
As radio groups need to be manually managed on OSX,
@@ -100,13 +103,12 @@ func (a *Application) processPlatformSettings() error {
a list of all members of the group and the number of members
in the group (this last one is for optimisation at the C layer).
*/
processedMenu := NewProcessedMenu(mac.Tray)
processedMenu := NewProcessedMenu(tray)
trayMenuJSON, err := json.Marshal(processedMenu)
if err != nil {
return err
}
C.SetTray(a.app, a.string2CString(string(trayMenuJSON)))
println("******************** SET TRAY!!!!! &&&&&&&&&&&&&&&&&&&&&&&&&&")
}
return nil