waveterm/wails
0
0
Fork 0
mirror of https://github.com/wavetermdev/wails.git synced 2026-08-05 13:53:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed and refactored context menu support

Browse Source
This commit is contained in:
Lea Anthony
2021-01-13 22:51:44 +11:00
parent de06fc7dcc
commit e65118e962
21 changed files with 223 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2/pkg/options/mac/mac.go
+1 -1
View File
@@ -10,5 +10,5 @@ type Options struct {
WindowBackgroundIsTranslucent bool
Menu *menu.Menu
TrayMenus []*menu.TrayMenu
ContextMenus *menu.ContextMenus
ContextMenus []*menu.ContextMenu
}
v2/pkg/options/options.go
+6 -11
View File
@@ -24,7 +24,7 @@ type App struct {
StartHidden bool
DevTools bool
RGBA int
ContextMenus *menu.ContextMenus
ContextMenus []*menu.ContextMenu
TrayMenus []*menu.TrayMenu
Menu *menu.Menu
Mac *mac.Options
@@ -89,15 +89,13 @@ func GetApplicationMenu(appoptions *App) *menu.Menu {
return result
}
func GetContextMenus(appoptions *App) *menu.ContextMenus {
var result *menu.ContextMenus
func GetContextMenus(appoptions *App) []*menu.ContextMenu {
var result []*menu.ContextMenu
result = appoptions.ContextMenus
var contextMenuOverrides *menu.ContextMenus
switch runtime.GOOS {
case "darwin":
if appoptions.Mac != nil {
contextMenuOverrides = appoptions.Mac.ContextMenus
result = appoptions.Mac.ContextMenus
}
//case "linux":
// if appoptions.Linux != nil {
@@ -109,11 +107,8 @@ func GetContextMenus(appoptions *App) *menu.ContextMenus {
// }
}
// Overwrite defaults with OS Specific context menus
if contextMenuOverrides != nil {
for id, contextMenu := range contextMenuOverrides.Items {
result.AddMenu(id, contextMenu)
}
if result == nil {
result = appoptions.ContextMenus
}
return result