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

[WIP] Support tray in menu manager

Browse Source
This commit is contained in:
Lea Anthony
2021-01-12 15:55:28 +11:00
parent 4e58b7697a
commit db6dde3e50
16 changed files with 250 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
v2/pkg/menu/tray.go
View File

@@ -1,10 +1,7 @@
package menu
// Tray are the options
type Tray struct {
// The ID of this tray
ID string
// TrayMenu are the options
type TrayMenu struct {
// Label is the text we wish to display in the tray
Label string

2
v2/pkg/options/mac/mac.go
View File

@@ -9,6 +9,6 @@ type Options struct {
WebviewIsTransparent bool
WindowBackgroundIsTranslucent bool
Menu *menu.Menu
Tray *menu.Tray
TrayMenus []*menu.TrayMenu
ContextMenus *menu.ContextMenus
}

22
v2/pkg/options/options.go
View File

@@ -25,7 +25,7 @@ type App struct {
DevTools bool
RGBA int
ContextMenus *menu.ContextMenus
Tray *menu.Tray
TrayMenus []*menu.TrayMenu
Menu *menu.Menu
Mac *mac.Options
Logger logger.Logger `json:"-"`
@@ -41,25 +41,25 @@ func MergeDefaults(appoptions *App) {
}
func GetTray(appoptions *App) *menu.Tray {
var result *menu.Tray
func GetTrayMenus(appoptions *App) []*menu.TrayMenu {
var result []*menu.TrayMenu
switch runtime.GOOS {
case "darwin":
if appoptions.Mac != nil {
result = appoptions.Mac.Tray
result = appoptions.Mac.TrayMenus
}
//case "linux":
// if appoptions.Linux != nil {
// result = appoptions.Linux.Tray
// result = appoptions.Linux.TrayMenu
// }
//case "windows":
// if appoptions.Windows != nil {
// result = appoptions.Windows.Tray
// result = appoptions.Windows.TrayMenu
// }
}
if result == nil {
result = appoptions.Tray
result = appoptions.TrayMenus
}
return result
@@ -74,11 +74,11 @@ func GetApplicationMenu(appoptions *App) *menu.Menu {
}
//case "linux":
// if appoptions.Linux != nil {
// result = appoptions.Linux.Tray
// result = appoptions.Linux.TrayMenu
// }
//case "windows":
// if appoptions.Windows != nil {
// result = appoptions.Windows.Tray
// result = appoptions.Windows.TrayMenu
// }
}
@@ -101,11 +101,11 @@ func GetContextMenus(appoptions *App) *menu.ContextMenus {
}
//case "linux":
// if appoptions.Linux != nil {
// result = appoptions.Linux.Tray
// result = appoptions.Linux.TrayMenu
// }
//case "windows":
// if appoptions.Windows != nil {
// result = appoptions.Windows.Tray
// result = appoptions.Windows.TrayMenu
// }
}