v2.0.0-alpha.13

v2/cmd/wails/version.go

@@ -1,3 +1,3 @@
 package main
 
-var version = "v2.0.0-alpha.10"
+var version = "v2.0.0-alpha.13"

v2/internal/ffenestri/common.c

@@ -86,3 +86,10 @@ bool getJSONInt(JsonNode *item, const char* key, int *result) {
     return false;
 }
 
+JsonNode* mustParseJSON(const char* JSON) {
+    JsonNode* parsedUpdate = json_decode(JSON);
+    if ( parsedUpdate == NULL ) {
+        ABORT("Unable to decode JSON: %s\n", JSON);
+    }
+    return parsedUpdate;
+}

v2/internal/ffenestri/common.h

@@ -35,4 +35,6 @@ JsonNode* mustJSONObject(JsonNode *node, const char* key);
 bool getJSONBool(JsonNode *item, const char* key, bool *result);
 bool getJSONInt(JsonNode *item, const char* key, int *result);
 
+JsonNode* mustParseJSON(const char* JSON);
+
 #endif //ASSETS_C_COMMON_H

v2/internal/ffenestri/ffenestri.h

@@ -37,6 +37,7 @@ extern void DarkModeEnabled(struct Application*, char *callbackID);
 extern void SetApplicationMenu(struct Application*, const char *);
 extern void AddTrayMenu(struct Application*, const char *menuTrayJSON);
 extern void SetTrayMenu(struct Application*, const char *menuTrayJSON);
+extern void UpdateTrayMenuLabel(struct Application*, const char* JSON);
 extern void AddContextMenu(struct Application*, char *contextMenuJSON);
 extern void UpdateContextMenu(struct Application*, char *contextMenuJSON);
 

v2/internal/ffenestri/ffenestri_client.go

@@ -192,6 +192,10 @@ func (c *Client) SetTrayMenu(trayMenuJSON string) {
 	C.SetTrayMenu(c.app.app, c.app.string2CString(trayMenuJSON))
 }
 
+func (c *Client) UpdateTrayMenuLabel(JSON string) {
+	C.UpdateTrayMenuLabel(c.app.app, c.app.string2CString(JSON))
+}
+
 func (c *Client) UpdateContextMenu(contextMenuJSON string) {
 	C.UpdateContextMenu(c.app.app, c.app.string2CString(contextMenuJSON))
 }

v2/internal/ffenestri/ffenestri_darwin.c

@@ -913,7 +913,8 @@ void SetDebug(void *applicationPointer, int flag) {
 }
 
 
-// SetContextMenus sets the context menu map for this application
+
+// AddContextMenu sets the context menu map for this application
 void AddContextMenu(struct Application *app, const char *contextMenuJSON) {
 	AddContextMenuToStore(app->contextMenuStore, contextMenuJSON);
 }
@@ -932,6 +933,13 @@ void SetTrayMenu(struct Application *app, const char* trayMenuJSON) {
     );
 }
 
+void UpdateTrayMenuLabel(struct Application* app, const char* JSON) {
+    ON_MAIN_THREAD(
+        UpdateTrayMenuLabelInStore(app->trayMenuStore, JSON);
+    );
+}
+
+
 void SetBindings(struct Application *app, const char *bindings) {
 	const char* temp = concat("window.wailsbindings = \"", bindings);
 	const char* jscall = concat(temp, "\";");

v2/internal/ffenestri/ffenestri_darwin.h

@@ -107,7 +107,7 @@ void SetAppearance(struct Application* app, const char *);
 void WebviewIsTransparent(struct Application* app);
 void WindowBackgroundIsTranslucent(struct Application* app);
 void SetTray(struct Application* app, const char *, const char *, const char *);
-void SetContextMenus(struct Application* app, const char *);
+//void SetContextMenus(struct Application* app, const char *);
 void AddTrayMenu(struct Application* app, const char *);
 
 #endif

v2/internal/ffenestri/menu_darwin.c

@@ -63,8 +63,6 @@ MenuItemCallbackData* CreateMenuItemCallbackData(Menu *menu, id menuItem, const
     return result;
 }
 
-
-
 void DeleteMenu(Menu *menu) {
 
     // Free menu item hashmap
@@ -99,7 +97,11 @@ void DeleteMenu(Menu *menu) {
 
 // Creates a JSON message for the given menuItemID and data
 const char* createMenuClickedMessage(const char *menuItemID, const char *data, enum MenuType menuType, const char *parentID) {
+
     JsonNode *jsonObject = json_mkobject();
+    if (menuItemID == NULL ) {
+        ABORT("Item ID NULL for menu!!\n");
+    }
     json_append_member(jsonObject, "menuItemID", json_mkstring(menuItemID));
     json_append_member(jsonObject, "menuType", json_mkstring(MenuTypeAsString[(int)menuType]));
     if (data != NULL) {
@@ -572,7 +574,7 @@ id processCheckboxMenuItem(Menu *menu, id parentmenu, const char *title, const c
     return item;
 }
 
-id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers) {
+id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers, const char* tooltip) {
     id item = ALLOC("NSMenuItem");
 
     // Create a MenuItemCallbackData
@@ -698,7 +700,7 @@ void processMenuItem(Menu *menu, id parentMenu, JsonNode *item) {
     if( type != NULL ) {
 
         if( STREQ(type->string_, "Text")) {
-            processTextMenuItem(menu, parentMenu, label, menuid, disabled, acceleratorkey, modifiers);
+            processTextMenuItem(menu, parentMenu, label, menuid, disabled, acceleratorkey, modifiers, tooltip, image);
         }
         else if ( STREQ(type->string_, "Separator")) {
             addSeparator(parentMenu);

v2/internal/ffenestri/menu_darwin.h

@@ -90,7 +90,7 @@ id processRadioMenuItem(Menu *menu, id parentmenu, const char *title, const char
 
 id processCheckboxMenuItem(Menu *menu, id parentmenu, const char *title, const char *menuid, bool disabled, bool checked, const char *key);
 
-id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers);
+id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers, const char* tooltip, const char* image);
 
 void processMenuItem(Menu *menu, id parentMenu, JsonNode *item);
 void processMenuData(Menu *menu, JsonNode *menuData);

v2/internal/ffenestri/traymenu_darwin.c

@@ -49,42 +49,19 @@ void DumpTrayMenu(TrayMenu* trayMenu) {
     printf("    ['%s':%p] = { label: '%s', icon: '%s', menu: %p, statusbar: %p  }\n", trayMenu->ID, trayMenu, trayMenu->label, trayMenu->icon, trayMenu->menu, trayMenu->statusbaritem );
 }
 
-void ShowTrayMenu(TrayMenu* trayMenu) {
 
-    // Create a status bar item if we don't have one
-    if( trayMenu->statusbaritem == NULL ) {
-        id statusBar = msg( c("NSStatusBar"), s("systemStatusBar") );
-        trayMenu->statusbaritem = msg(statusBar, s("statusItemWithLength:"), NSVariableStatusItemLength);
-        msg(trayMenu->statusbaritem, s("retain"));
-
-    }
-
-    id statusBarButton = msg(trayMenu->statusbaritem, s("button"));
-    msg(statusBarButton, s("setImagePosition:"), trayMenu->trayIconPosition);
-
-    // Update the icon if needed
-    UpdateTrayMenuIcon(trayMenu);
-
-    // Update the label if needed
-    UpdateTrayMenuLabel(trayMenu);
-
-	// Update the menu
-    id menu = GetMenu(trayMenu->menu);
-    msg(trayMenu->statusbaritem, s("setMenu:"), menu);
-}
-
-void UpdateTrayMenuLabel(TrayMenu *trayMenu) {
+void UpdateTrayLabel(TrayMenu *trayMenu, const char *label) {
 
     // Exit early if NULL
     if( trayMenu->label == NULL ) {
         return;
     }
-    // We don't check for a
+    // Update button label
     id statusBarButton = msg(trayMenu->statusbaritem, s("button"));
-    msg(statusBarButton, s("setTitle:"), str(trayMenu->label));
+    msg(statusBarButton, s("setTitle:"), str(label));
 }
 
-void UpdateTrayMenuIcon(TrayMenu *trayMenu) {
+void UpdateTrayIcon(TrayMenu *trayMenu) {
 
     // Exit early if NULL
     if( trayMenu->icon == NULL ) {
@@ -105,6 +82,32 @@ void UpdateTrayMenuIcon(TrayMenu *trayMenu) {
     msg(statusBarButton, s("setImage:"), trayImage);
 }
 
+
+
+void ShowTrayMenu(TrayMenu* trayMenu) {
+
+    // Create a status bar item if we don't have one
+    if( trayMenu->statusbaritem == NULL ) {
+        id statusBar = msg( c("NSStatusBar"), s("systemStatusBar") );
+        trayMenu->statusbaritem = msg(statusBar, s("statusItemWithLength:"), NSVariableStatusItemLength);
+        msg(trayMenu->statusbaritem, s("retain"));
+
+    }
+
+    id statusBarButton = msg(trayMenu->statusbaritem, s("button"));
+    msg(statusBarButton, s("setImagePosition:"), trayMenu->trayIconPosition);
+
+    // Update the icon if needed
+    UpdateTrayIcon(trayMenu);
+
+    // Update the label if needed
+    UpdateTrayLabel(trayMenu, trayMenu->label);
+
+    // Update the menu
+    id menu = GetMenu(trayMenu->menu);
+    msg(trayMenu->statusbaritem, s("setMenu:"), menu);
+}
+
 // UpdateTrayMenuInPlace receives 2 menus. The current menu gets
 // updated with the data from the new menu.
 void UpdateTrayMenuInPlace(TrayMenu* currentMenu, TrayMenu* newMenu) {

v2/internal/ffenestri/traymenu_darwin.h

@@ -27,8 +27,8 @@ TrayMenu* NewTrayMenu(const char *trayJSON);
 void DumpTrayMenu(TrayMenu* trayMenu);
 void ShowTrayMenu(TrayMenu* trayMenu);
 void UpdateTrayMenuInPlace(TrayMenu* currentMenu, TrayMenu* newMenu);
-void UpdateTrayMenuIcon(TrayMenu *trayMenu);
-void UpdateTrayMenuLabel(TrayMenu *trayMenu);
+void UpdateTrayIcon(TrayMenu *trayMenu);
+void UpdateTrayLabel(TrayMenu *trayMenu, const char*);
 
 void LoadTrayIcons();
 void UnloadTrayIcons();

v2/internal/ffenestri/traymenustore_darwin.c

@@ -72,15 +72,39 @@ TrayMenu* GetTrayMenuFromStore(TrayMenuStore* store, const char* menuID) {
     return hashmap_get(&store->trayMenuMap, menuID, strlen(menuID));
 }
 
+TrayMenu* MustGetTrayMenuFromStore(TrayMenuStore* store, const char* menuID) {
+    // Get the current menu
+    TrayMenu* result = hashmap_get(&store->trayMenuMap, menuID, strlen(menuID));
+    if (result == NULL ) {
+        ABORT("Unable to find TrayMenu with ID '%s' in the TrayMenuStore!", menuID);
+    }
+    return result;
+}
+
+void UpdateTrayMenuLabelInStore(TrayMenuStore* store, const char* JSON) {
+    // Parse the JSON
+    JsonNode *parsedUpdate = mustParseJSON(JSON);
+
+    // Get the data out
+    const char* ID = mustJSONString(parsedUpdate, "ID");
+    const char* Label = mustJSONString(parsedUpdate, "Label");
+
+    // Check we have this menu
+    TrayMenu *menu = MustGetTrayMenuFromStore(store, ID);
+    UpdateTrayLabel(menu, Label);
+
+}
+
 void UpdateTrayMenuInStore(TrayMenuStore* store, const char* menuJSON) {
     TrayMenu* newMenu = NewTrayMenu(menuJSON);
+    DumpTrayMenu(newMenu);
 
     // Get the current menu
     TrayMenu *currentMenu = GetTrayMenuFromStore(store, newMenu->ID);
 
     // If we don't have a menu, we create one
     if ( currentMenu == NULL ) {
-
+        printf("  currentMenu = NULL\n");
         // Store the new menu
         hashmap_put(&store->trayMenuMap, newMenu->ID, strlen(newMenu->ID), newMenu);
 
@@ -88,6 +112,7 @@ void UpdateTrayMenuInStore(TrayMenuStore* store, const char* menuJSON) {
         ShowTrayMenu(newMenu);
         return;
     }
+    DumpTrayMenu(currentMenu);
 
     // Save the status bar reference
     newMenu->statusbaritem = currentMenu->statusbaritem;
@@ -98,12 +123,6 @@ void UpdateTrayMenuInStore(TrayMenuStore* store, const char* menuJSON) {
     DeleteMenu(currentMenu->menu);
     currentMenu->menu = NULL;
 
-    // Free JSON
-    if (currentMenu->processedJSON != NULL ) {
-        json_delete(currentMenu->processedJSON);
-        currentMenu->processedJSON = NULL;
-    }
-
     // Free the tray menu memory
     MEMFREE(currentMenu);
 

v2/internal/ffenestri/traymenustore_darwin.h

@@ -22,4 +22,6 @@ void UpdateTrayMenuInStore(TrayMenuStore* store, const char* menuJSON);
 void ShowTrayMenusInStore(TrayMenuStore* store);
 void DeleteTrayMenuStore(TrayMenuStore* store);
 
+void UpdateTrayMenuLabelInStore(TrayMenuStore* store, const char* JSON);
+
 #endif //TRAYMENUSTORE_DARWIN_H

v2/internal/menumanager/processedMenu.go

@@ -9,28 +9,35 @@ import (
 type ProcessedMenuItem struct {
 	ID string
 	// Label is what appears as the menu text
-	Label string
+	Label string `json:",omitempty"`
 	// Role is a predefined menu type
-	Role menu.Role `json:"Role,omitempty"`
+	Role menu.Role `json:",omitempty"`
 	// Accelerator holds a representation of a key binding
-	Accelerator *keys.Accelerator `json:"Accelerator,omitempty"`
+	Accelerator *keys.Accelerator `json:",omitempty"`
 	// Type of MenuItem, EG: Checkbox, Text, Separator, Radio, Submenu
 	Type menu.Type
 	// Disabled makes the item unselectable
-	Disabled bool
+	Disabled bool `json:",omitempty"`
 	// Hidden ensures that the item is not shown in the menu
-	Hidden bool
+	Hidden bool `json:",omitempty"`
 	// Checked indicates if the item is selected (used by Checkbox and Radio types only)
-	Checked bool
+	Checked bool `json:",omitempty"`
 	// Submenu contains a list of menu items that will be shown as a submenu
 	//SubMenu []*MenuItem `json:"SubMenu,omitempty"`
-	SubMenu *ProcessedMenu `json:"SubMenu,omitempty"`
+	SubMenu *ProcessedMenu `json:",omitempty"`
 
-	// Foreground colour in hex RGBA format EG: 0xFF0000FF = #FF0000FF = red
-	Foreground int
+	// Colour
+	RGBA string `json:",omitempty"`
 
-	// Background colour
-	Background int
+	// Font
+	FontSize int    `json:",omitempty"`
+	FontName string `json:",omitempty"`
+
+	// Image - base64 image data
+	Image string `json:",omitempty"`
+
+	// Tooltip
+	Tooltip string `json:",omitempty"`
 }
 
 func NewProcessedMenuItem(menuItemMap *MenuItemMap, menuItem *menu.MenuItem) *ProcessedMenuItem {
@@ -45,8 +52,12 @@ func NewProcessedMenuItem(menuItemMap *MenuItemMap, menuItem *menu.MenuItem) *Pr
 		Disabled:    menuItem.Disabled,
 		Hidden:      menuItem.Hidden,
 		Checked:     menuItem.Checked,
-		Foreground:  menuItem.Foreground,
-		Background:  menuItem.Background,
+		SubMenu:     nil,
+		RGBA:        menuItem.RGBA,
+		FontSize:    menuItem.FontSize,
+		FontName:    menuItem.FontName,
+		Image:       menuItem.Image,
+		Tooltip:     menuItem.Tooltip,
 	}
 
 	if menuItem.SubMenu != nil {

v2/internal/menumanager/traymenu.go

@@ -3,6 +3,7 @@ package menumanager
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/pkg/errors"
 	"github.com/wailsapp/wails/v2/pkg/menu"
 	"sync"
 )
@@ -94,6 +95,31 @@ func (m *Manager) GetTrayMenus() ([]string, error) {
 	return result, nil
 }
 
+func (m *Manager) UpdateTrayMenuLabel(trayMenu *menu.TrayMenu) (string, error) {
+	trayID, trayMenuKnown := m.trayMenuPointers[trayMenu]
+	if !trayMenuKnown {
+		return "", fmt.Errorf("[UpdateTrayMenuLabel] unknown tray id for tray %s", trayMenu.Label)
+	}
+
+	type LabelUpdate struct {
+		ID    string
+		Label string
+	}
+
+	update := &LabelUpdate{
+		ID:    trayID,
+		Label: trayMenu.Label,
+	}
+
+	data, err := json.Marshal(update)
+	if err != nil {
+		return "", errors.Wrap(err, "[UpdateTrayMenuLabel] ")
+	}
+
+	return string(data), nil
+
+}
+
 func (m *Manager) GetContextMenus() ([]string, error) {
 	result := []string{}
 	for _, contextMenu := range m.contextMenus {

v2/internal/messagedispatcher/dispatchclient.go

@@ -32,6 +32,7 @@ type Client interface {
 	DarkModeEnabled(callbackID string)
 	SetApplicationMenu(menuJSON string)
 	SetTrayMenu(trayMenuJSON string)
+	UpdateTrayMenuLabel(JSON string)
 	UpdateContextMenu(contextMenuJSON string)
 }
 

v2/internal/messagedispatcher/messagedispatcher.go

@@ -473,6 +473,20 @@ func (d *Dispatcher) processMenuMessage(result *servicebus.Message) {
 			client.frontend.UpdateContextMenu(updatedContextMenu)
 		}
 
+	case "updatetraymenulabel":
+		updatedTrayMenuLabel, ok := result.Data().(string)
+		if !ok {
+			d.logger.Error("Invalid data for 'menufrontend:updatetraymenulabel' : %#v",
+				result.Data())
+			return
+		}
+
+		// TODO: Work out what we mean in a multi window environment...
+		// For now we will just pick the first one
+		for _, client := range d.clients {
+			client.frontend.UpdateTrayMenuLabel(updatedTrayMenuLabel)
+		}
+
 	default:
 		d.logger.Error("Unknown menufrontend command: %s", command)
 	}

v2/internal/runtime/menu.go

@@ -10,6 +10,7 @@ type Menu interface {
 	UpdateApplicationMenu()
 	UpdateContextMenu(contextMenu *menu.ContextMenu)
 	SetTrayMenu(trayMenu *menu.TrayMenu)
+	UpdateTrayMenuLabel(trayMenu *menu.TrayMenu)
 }
 
 type menuRuntime struct {
@@ -34,3 +35,7 @@ func (m *menuRuntime) UpdateContextMenu(contextMenu *menu.ContextMenu) {
 func (m *menuRuntime) SetTrayMenu(trayMenu *menu.TrayMenu) {
 	m.bus.Publish("menu:settraymenu", trayMenu)
 }
+
+func (m *menuRuntime) UpdateTrayMenuLabel(trayMenu *menu.TrayMenu) {
+	m.bus.Publish("menu:updatetraymenulabel", trayMenu)
+}

v2/internal/subsystem/menu.go

@@ -131,6 +131,17 @@ func (m *Menu) Start() error {
 					// Notify frontend of menu change
 					m.bus.Publish("menufrontend:settraymenu", updatedMenu)
 
+				case "updatetraymenulabel":
+					trayMenu := menuMessage.Data().(*menu.TrayMenu)
+					updatedLabel, err := m.menuManager.UpdateTrayMenuLabel(trayMenu)
+					if err != nil {
+						m.logger.Trace("%s", err.Error())
+						return
+					}
+
+					// Notify frontend of menu change
+					m.bus.Publish("menufrontend:updatetraymenulabel", updatedLabel)
+
 				default:
 					m.logger.Error("unknown menu message: %+v", menuMessage)
 				}

v2/pkg/commands/build/base.go

@@ -211,7 +211,6 @@ func (b *BaseBuilder) CompileProject(options *Options) error {
 	options.CompiledBinary = compiledBinary
 
 	// Create the command
-	fmt.Printf("Compile command: %+v", commands.AsSlice())
 	cmd := exec.Command(options.Compiler, commands.AsSlice()...)
 
 	// Set the directory

v2/pkg/menu/menu.go

@@ -12,6 +12,14 @@ func (m *Menu) Append(item *MenuItem) {
 	m.Items = append(m.Items, item)
 }
 
+// Merge will append the items in the given menu
+// into this menu
+func (m *Menu) Merge(menu *Menu) {
+	for _, item := range menu.Items {
+		m.Items = append(m.Items, item)
+	}
+}
+
 func (m *Menu) Prepend(item *MenuItem) {
 	m.Items = append([]*MenuItem{item}, m.Items...)
 }

v2/pkg/menu/menuitem.go

@@ -28,11 +28,18 @@ type MenuItem struct {
 	// Callback function when menu clicked
 	Click Callback `json:"-"`
 
-	// Foreground colour in hex RGBA format EG: 0xFF0000FF = #FF0000FF = red
-	Foreground int
+	// Colour
+	RGBA string
 
-	// Background colour
-	Background int
+	// Font
+	FontSize int
+	FontName string
+
+	// Image - base64 image data
+	Image string
+
+	// Tooltip
+	Tooltip string
 
 	// This holds the menu item's parent.
 	parent *MenuItem

v2/pkg/str/str.go

@@ -0,0 +1,10 @@
+package str
+
+import (
+	"fmt"
+	"time"
+)
+
+func UnixNow() string {
+	return fmt.Sprintf("%+v", time.Now().Unix())
+}

v2/test/kitchensink/go.sum

@@ -58,6 +58,7 @@ github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=