v2.0.0-alpha.41

v2/cmd/wails/internal/commands/build/build.go

@@ -57,6 +57,11 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 	keepAssets := false
 	command.BoolFlag("k", "Keep generated assets", &keepAssets)
 
+	appleIdentity := ""
+	if runtime.GOOS == "darwin" {
+		command.StringFlag("sign", "Signs your app with the given identity.", &appleIdentity)
+	}
+
 	command.Action(func() error {
 
 		// Create logger
@@ -72,6 +77,11 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 			app.PrintBanner()
 		}
 
+		// Ensure package is used with apple identity
+		if appleIdentity != "" && pack == false {
+			return fmt.Errorf("must use `-package` flag when using `-sign`")
+		}
+
 		task := fmt.Sprintf("Building %s Application", strings.Title(outputType))
 		logger.Println(task)
 		logger.Println(strings.Repeat("-", len(task)))
@@ -84,14 +94,15 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 
 		// Create BuildOptions
 		buildOptions := &build.Options{
-			Logger:     logger,
-			OutputType: outputType,
-			Mode:       mode,
-			Pack:       pack,
-			Platform:   platform,
-			LDFlags:    ldflags,
-			Compiler:   compilerCommand,
-			KeepAssets: keepAssets,
+			Logger:        logger,
+			OutputType:    outputType,
+			Mode:          mode,
+			Pack:          pack,
+			Platform:      platform,
+			LDFlags:       ldflags,
+			Compiler:      compilerCommand,
+			KeepAssets:    keepAssets,
+			AppleIdentity: appleIdentity,
 		}
 
 		return doBuild(buildOptions)

v2/cmd/wails/version.go

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

v2/internal/app/desktop.go

@@ -117,14 +117,6 @@ func (a *App) Run() error {
 	parentContext := context.WithValue(context.Background(), "waitgroup", &subsystemWaitGroup)
 	ctx, cancel := context.WithCancel(parentContext)
 
-	// Setup signal handler
-	signalsubsystem, err := signal.NewManager(ctx, cancel, a.servicebus, a.logger, a.shutdownCallback)
-	if err != nil {
-		return err
-	}
-	a.signal = signalsubsystem
-	a.signal.Start()
-
 	// Start the service bus
 	a.servicebus.Debug()
 	err = a.servicebus.Start()
@@ -132,7 +124,7 @@ func (a *App) Run() error {
 		return err
 	}
 
-	runtimesubsystem, err := subsystem.NewRuntime(ctx, a.servicebus, a.logger, a.startupCallback, a.shutdownCallback)
+	runtimesubsystem, err := subsystem.NewRuntime(ctx, a.servicebus, a.logger, a.startupCallback)
 	if err != nil {
 		return err
 	}
@@ -207,6 +199,14 @@ func (a *App) Run() error {
 		return err
 	}
 
+	// Setup signal handler
+	signalsubsystem, err := signal.NewManager(ctx, cancel, a.servicebus, a.logger)
+	if err != nil {
+		return err
+	}
+	a.signal = signalsubsystem
+	a.signal.Start()
+
 	err = a.window.Run(dispatcher, bindingDump, a.debug)
 	a.logger.Trace("Ffenestri.Run() exited")
 	if err != nil {
@@ -231,5 +231,10 @@ func (a *App) Run() error {
 		return err
 	}
 
+	// Shutdown callback
+	if a.shutdownCallback != nil {
+		a.shutdownCallback()
+	}
+
 	return nil
 }

v2/internal/app/dev.go

@@ -118,14 +118,6 @@ func (a *App) Run() error {
 	parentContext := context.WithValue(context.Background(), "waitgroup", &subsystemWaitGroup)
 	ctx, cancel := context.WithCancel(parentContext)
 
-	// Setup signal handler
-	signalsubsystem, err := signal.NewManager(ctx, cancel, a.servicebus, a.logger, a.shutdownCallback)
-	if err != nil {
-		return err
-	}
-	a.signal = signalsubsystem
-	a.signal.Start()
-
 	// Start the service bus
 	a.servicebus.Debug()
 	err = a.servicebus.Start()
@@ -133,7 +125,7 @@ func (a *App) Run() error {
 		return err
 	}
 
-	runtimesubsystem, err := subsystem.NewRuntime(ctx, a.servicebus, a.logger, a.startupCallback, a.shutdownCallback)
+	runtimesubsystem, err := subsystem.NewRuntime(ctx, a.servicebus, a.logger, a.startupCallback)
 	if err != nil {
 		return err
 	}
@@ -211,6 +203,14 @@ func (a *App) Run() error {
 	// Generate backend.js
 	a.bindings.GenerateBackendJS()
 
+	// Setup signal handler
+	signalsubsystem, err := signal.NewManager(ctx, cancel, a.servicebus, a.logger)
+	if err != nil {
+		return err
+	}
+	a.signal = signalsubsystem
+	a.signal.Start()
+
 	err = a.bridge.Run(dispatcher, a.menuManager, bindingDump, a.debug)
 	a.logger.Trace("Bridge.Run() exited")
 	if err != nil {
@@ -235,6 +235,10 @@ func (a *App) Run() error {
 		return err
 	}
 
+	// Shutdown callback
+	if a.shutdownCallback != nil {
+		a.shutdownCallback()
+	}
 	return nil
 
 }

v2/internal/bridge/client.go

@@ -11,6 +11,10 @@ type BridgeClient struct {
 	messageCache chan string
 }
 
+func (b BridgeClient) DeleteTrayMenuByID(id string) {
+	b.session.sendMessage("TD" + id)
+}
+
 func NewBridgeClient() *BridgeClient {
 	return &BridgeClient{
 		messageCache: make(chan string, 100),

v2/internal/bridge/dialog_client.go

@@ -19,6 +19,9 @@ type DialogClient struct {
 	log        *logger.Logger
 }
 
+func (d *DialogClient) DeleteTrayMenuByID(id string) {
+}
+
 func NewDialogClient(log *logger.Logger) *DialogClient {
 	return &DialogClient{
 		log: log,

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 DeleteTrayMenuByID(struct Application*, const char *id);
 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

@@ -208,3 +208,7 @@ func (c *Client) UpdateTrayMenuLabel(JSON string) {
 func (c *Client) UpdateContextMenu(contextMenuJSON string) {
 	C.UpdateContextMenu(c.app.app, c.app.string2CString(contextMenuJSON))
 }
+
+func (c *Client) DeleteTrayMenuByID(id string) {
+	C.DeleteTrayMenuByID(c.app.app, c.app.string2CString(id))
+}

v2/internal/ffenestri/ffenestri_darwin.c

@@ -79,6 +79,7 @@ struct Application {
 	id mouseEvent;
 	id mouseDownMonitor;
 	id mouseUpMonitor;
+	int activationPolicy;
 
 	// Window Data
 	const char *title;
@@ -253,7 +254,7 @@ void Hide(struct Application *app) {
     if( app->shuttingDown ) return;
 
 	ON_MAIN_THREAD(
-		msg(app->application, s("hide:"))
+		msg(app->application, s("hide:"));
 	);
 }
 
@@ -1046,6 +1047,12 @@ void SetTrayMenu(struct Application *app, const char* trayMenuJSON) {
     );
 }
 
+void DeleteTrayMenuByID(struct Application *app, const char *id) {
+    ON_MAIN_THREAD(
+        DeleteTrayMenuInStore(app->trayMenuStore, id);
+    );
+}
+
 void UpdateTrayMenuLabel(struct Application* app, const char* JSON) {
     // Guard against calling during shutdown
     if( app->shuttingDown ) return;
@@ -1112,7 +1119,7 @@ void processDecorations(struct Application *app) {
 void createApplication(struct Application *app) {
 	id application = msg(c("NSApplication"), s("sharedApplication"));
 	app->application = application;
-	msg(application, s("setActivationPolicy:"), 0);
+	msg(application, s("setActivationPolicy:"), app->activationPolicy);
 }
 
 void DarkModeEnabled(struct Application *app, const char *callbackID) {
@@ -1170,13 +1177,19 @@ void createDelegate(struct Application *app) {
 bool windowShouldClose(id self, SEL cmd, id sender) {
     msg(sender, s("orderBack:"));
     return false;
-  }
+}
+
+bool windowShouldExit(id self, SEL cmd, id sender) {
+    msg(sender, s("orderBack:"));
+    messageFromWindowCallback("WC");
+    return false;
+}
 
 void createMainWindow(struct Application *app) {
 	// Create main window
 	id mainWindow = ALLOC("NSWindow");
 	mainWindow = msg(mainWindow, s("initWithContentRect:styleMask:backing:defer:"),
-		  CGRectMake(0, 0, app->width, app->height), app->decorations, NSBackingStoreBuffered, NO);
+    CGRectMake(0, 0, app->width, app->height), app->decorations, NSBackingStoreBuffered, NO);
 	msg(mainWindow, s("autorelease"));
 
 	// Set Appearance
@@ -1190,14 +1203,16 @@ void createMainWindow(struct Application *app) {
 	msg(mainWindow, s("setTitlebarAppearsTransparent:"), app->titlebarAppearsTransparent ? YES : NO);
 	msg(mainWindow, s("setTitleVisibility:"), app->hideTitle);
 
-	if( app->hideWindowOnClose ) {
-	    // Create window delegate to override windowShouldClose
-        Class delegateClass = objc_allocateClassPair((Class) c("NSObject"), "WindowDelegate", 0);
-        bool resultAddProtoc = class_addProtocol(delegateClass, objc_getProtocol("NSWindowDelegate"));
+    // Create window delegate to override windowShouldClose
+    Class delegateClass = objc_allocateClassPair((Class) c("NSObject"), "WindowDelegate", 0);
+    bool resultAddProtoc = class_addProtocol(delegateClass, objc_getProtocol("NSWindowDelegate"));
+    if( app->hideWindowOnClose ) {
         class_replaceMethod(delegateClass, s("windowShouldClose:"), (IMP) windowShouldClose, "v@:@");
-        app->windowDelegate = msg((id)delegateClass, s("new"));
-        msg(mainWindow, s("setDelegate:"), app->windowDelegate);
-	}
+    } else {
+        class_replaceMethod(delegateClass, s("windowShouldClose:"), (IMP) windowShouldExit, "v@:@");
+    }
+    app->windowDelegate = msg((id)delegateClass, s("new"));
+    msg(mainWindow, s("setDelegate:"), app->windowDelegate);
 
 	app->mainWindow = mainWindow;
 }
@@ -1812,15 +1827,18 @@ void Run(struct Application *app, int argc, char **argv) {
 	MEMFREE(internalCode);
 }
 
+void SetActivationPolicy(struct Application* app, int policy) {
+    app->activationPolicy = policy;
+}
+
 // Quit will stop the cocoa application and free up all the memory
 // used by the application
 void Quit(struct Application *app) {
 	Debug(app, "Quit Called");
     msg(app->application, s("stop:"), NULL);
-	ON_MAIN_THREAD (
-		// Terminate app by triggering a UI event
-    	SetSize(app, 0, 0);
-	);
+    SetSize(app, 0, 0);
+    Show(app);
+    Hide(app);
 }
 
 void* NewApplication(const char *title, int width, int height, int resizable, int devtools, int fullscreen, int startHidden, int logLevel, int hideWindowOnClose) {
@@ -1884,6 +1902,8 @@ void* NewApplication(const char *title, int width, int height, int resizable, in
 
 	result->shuttingDown = false;
 
+	result->activationPolicy = NSApplicationActivationPolicyRegular;
+
     return (void*) result;
 }
 

v2/internal/ffenestri/ffenestri_darwin.go

@@ -48,6 +48,9 @@ func (a *Application) processPlatformSettings() error {
 		C.SetAppearance(a.app, a.string2CString(string(mac.Appearance)))
 	}
 
+	// Set activation policy
+	C.SetActivationPolicy(a.app, C.int(mac.ActivationPolicy))
+
 	// Check if the webview should be transparent
 	if mac.WebviewIsTransparent {
 		C.WebviewIsTransparent(a.app)

v2/internal/ffenestri/ffenestri_darwin.h

@@ -66,6 +66,10 @@
 #define NSControlStateValueOff 0
 #define NSControlStateValueOn 1
 
+#define NSApplicationActivationPolicyRegular    0
+#define NSApplicationActivationPolicyAccessory  1
+#define NSApplicationActivationPolicyProhibited 2
+
 // Unbelievably, if the user swaps their button preference
 // then right buttons are reported as left buttons
 #define NSEventMaskLeftMouseDown 1 << 1
@@ -110,6 +114,8 @@ void SetTray(struct Application* app, const char *, const char *, const char *);
 //void SetContextMenus(struct Application* app, const char *);
 void AddTrayMenu(struct Application* app, const char *);
 
+void SetActivationPolicy(struct Application* app, int policy);
+
 void* lookupStringConstant(id constantName);
 
 #endif

v2/internal/ffenestri/menu_darwin.c

@@ -508,6 +508,7 @@ unsigned long parseModifiers(const char **modifiers) {
     const char *thisModifier = modifiers[0];
     int count = 0;
     while( thisModifier != NULL ) {
+
         // Determine flags
         if( STREQ(thisModifier, "cmdorctrl") ) {
             result |= NSEventModifierFlagCommand;
@@ -521,7 +522,7 @@ unsigned long parseModifiers(const char **modifiers) {
         if( STREQ(thisModifier, "super") ) {
             result |= NSEventModifierFlagCommand;
         }
-        if( STREQ(thisModifier, "control") ) {
+        if( STREQ(thisModifier, "ctrl") ) {
             result |= NSEventModifierFlagControl;
         }
         count++;

v2/internal/ffenestri/traymenustore_darwin.c

@@ -16,6 +16,11 @@ TrayMenuStore* NewTrayMenuStore() {
         ABORT("[NewTrayMenuStore] Not enough memory to allocate trayMenuMap!");
     }
 
+    if (pthread_mutex_init(&result->lock, NULL) != 0) {
+        printf("\n mutex init has failed\n");
+        exit(1);
+    }
+
     return result;
 }
 
@@ -25,15 +30,19 @@ int dumpTrayMenu(void *const context, struct hashmap_element_s *const e) {
 }
 
 void DumpTrayMenuStore(TrayMenuStore* store) {
+    pthread_mutex_lock(&store->lock);
     hashmap_iterate_pairs(&store->trayMenuMap, dumpTrayMenu, NULL);
+    pthread_mutex_unlock(&store->lock);
 }
 
 void AddTrayMenuToStore(TrayMenuStore* store, const char* menuJSON) {
+
     TrayMenu* newMenu = NewTrayMenu(menuJSON);
 
+    pthread_mutex_lock(&store->lock);
     //TODO: check if there is already an entry for this menu
     hashmap_put(&store->trayMenuMap, newMenu->ID, strlen(newMenu->ID), newMenu);
-
+    pthread_mutex_unlock(&store->lock);
 }
 
 int showTrayMenu(void *const context, struct hashmap_element_s *const e) {
@@ -43,12 +52,13 @@ int showTrayMenu(void *const context, struct hashmap_element_s *const e) {
 }
 
 void ShowTrayMenusInStore(TrayMenuStore* store) {
+    pthread_mutex_lock(&store->lock);
     if( hashmap_num_entries(&store->trayMenuMap) > 0 ) {
         hashmap_iterate_pairs(&store->trayMenuMap, showTrayMenu, NULL);
     }
+    pthread_mutex_unlock(&store->lock);
 }
 
-
 int freeTrayMenu(void *const context, struct hashmap_element_s *const e) {
     DeleteTrayMenu(e->data);
     return -1;
@@ -65,22 +75,39 @@ void DeleteTrayMenuStore(TrayMenuStore *store) {
 
     // Destroy tray menu map
     hashmap_destroy(&store->trayMenuMap);
+
+    pthread_mutex_destroy(&store->lock);
 }
 
 TrayMenu* GetTrayMenuFromStore(TrayMenuStore* store, const char* menuID) {
     // Get the current menu
-    return hashmap_get(&store->trayMenuMap, menuID, strlen(menuID));
+    pthread_mutex_lock(&store->lock);
+    TrayMenu* result = hashmap_get(&store->trayMenuMap, menuID, strlen(menuID));
+    pthread_mutex_unlock(&store->lock);
+    return result;
 }
 
 TrayMenu* MustGetTrayMenuFromStore(TrayMenuStore* store, const char* menuID) {
     // Get the current menu
+    pthread_mutex_lock(&store->lock);
     TrayMenu* result = hashmap_get(&store->trayMenuMap, menuID, strlen(menuID));
+    pthread_mutex_unlock(&store->lock);
+
     if (result == NULL ) {
         ABORT("Unable to find TrayMenu with ID '%s' in the TrayMenuStore!", menuID);
     }
     return result;
 }
 
+void DeleteTrayMenuInStore(TrayMenuStore* store, const char* ID) {
+
+    TrayMenu *menu = MustGetTrayMenuFromStore(store, ID);
+    pthread_mutex_lock(&store->lock);
+    hashmap_remove(&store->trayMenuMap, ID, strlen(ID));
+    pthread_mutex_unlock(&store->lock);
+    DeleteTrayMenu(menu);
+}
+
 void UpdateTrayMenuLabelInStore(TrayMenuStore* store, const char* JSON) {
     // Parse the JSON
     JsonNode *parsedUpdate = mustParseJSON(JSON);
@@ -105,7 +132,9 @@ void UpdateTrayMenuInStore(TrayMenuStore* store, const char* menuJSON) {
     // If we don't have a menu, we create one
     if ( currentMenu == NULL ) {
         // Store the new menu
+        pthread_mutex_lock(&store->lock);
         hashmap_put(&store->trayMenuMap, newMenu->ID, strlen(newMenu->ID), newMenu);
+        pthread_mutex_unlock(&store->lock);
 
         // Show it
         ShowTrayMenu(newMenu);
@@ -116,7 +145,9 @@ void UpdateTrayMenuInStore(TrayMenuStore* store, const char* menuJSON) {
     // Save the status bar reference
     newMenu->statusbaritem = currentMenu->statusbaritem;
 
+    pthread_mutex_lock(&store->lock);
     hashmap_remove(&store->trayMenuMap, newMenu->ID, strlen(newMenu->ID));
+    pthread_mutex_unlock(&store->lock);
 
     // Delete the current menu
     DeleteMenu(currentMenu->menu);
@@ -125,9 +156,10 @@ void UpdateTrayMenuInStore(TrayMenuStore* store, const char* menuJSON) {
     // Free the tray menu memory
     MEMFREE(currentMenu);
 
+    pthread_mutex_lock(&store->lock);
     hashmap_put(&store->trayMenuMap, newMenu->ID, strlen(newMenu->ID), newMenu);
+    pthread_mutex_unlock(&store->lock);
 
     // Show the updated menu
     ShowTrayMenu(newMenu);
-
 }

v2/internal/ffenestri/traymenustore_darwin.h

@@ -5,6 +5,8 @@
 #ifndef TRAYMENUSTORE_DARWIN_H
 #define TRAYMENUSTORE_DARWIN_H
 
+#include <pthread.h>
+
 typedef struct {
 
 	int dummy;
@@ -13,6 +15,8 @@ typedef struct {
     // It maps tray IDs to TrayMenu*
     struct hashmap_s trayMenuMap;
 
+    pthread_mutex_t lock;
+
 } TrayMenuStore;
 
 TrayMenuStore* NewTrayMenuStore();
@@ -23,5 +27,6 @@ void ShowTrayMenusInStore(TrayMenuStore* store);
 void DeleteTrayMenuStore(TrayMenuStore* store);
 
 void UpdateTrayMenuLabelInStore(TrayMenuStore* store, const char* JSON);
+void DeleteTrayMenuInStore(TrayMenuStore* store, const char* id);
 
 #endif //TRAYMENUSTORE_DARWIN_H

v2/internal/fs/fs.go

@@ -40,7 +40,7 @@ func Mkdir(dirname string) error {
 // Returns error on failure
 func MkDirs(fullPath string, mode ...os.FileMode) error {
 	var perms os.FileMode
-	perms = 0700
+	perms = 0755
 	if len(mode) == 1 {
 		perms = mode[0]
 	}
@@ -243,7 +243,7 @@ func CopyDir(src string, dst string) (err error) {
 		return fmt.Errorf("destination already exists")
 	}
 
-	err = os.MkdirAll(dst, si.Mode())
+	err = MkDirs(dst)
 	if err != nil {
 		return
 	}

v2/internal/menumanager/traymenu.go

@@ -3,20 +3,23 @@ package menumanager
 import (
 	"encoding/json"
 	"fmt"
+	"strconv"
+	"sync"
+
 	"github.com/pkg/errors"
 	"github.com/wailsapp/wails/v2/pkg/menu"
-	"sync"
 )
 
 var trayMenuID int
 var trayMenuIDMutex sync.Mutex
 
 func generateTrayID() string {
+	var idStr string
 	trayMenuIDMutex.Lock()
-	result := fmt.Sprintf("%d", trayMenuID)
+	idStr = strconv.Itoa(trayMenuID)
 	trayMenuID++
 	trayMenuIDMutex.Unlock()
-	return result
+	return idStr
 }
 
 type TrayMenu struct {
@@ -65,6 +68,14 @@ func (m *Manager) AddTrayMenu(trayMenu *menu.TrayMenu) (string, error) {
 	return newTrayMenu.AsJSON()
 }
 
+func (m *Manager) GetTrayID(trayMenu *menu.TrayMenu) (string, error) {
+	trayID, exists := m.trayMenuPointers[trayMenu]
+	if !exists {
+		return "", fmt.Errorf("Unable to find menu ID for tray menu!")
+	}
+	return trayID, nil
+}
+
 // SetTrayMenu updates or creates a menu
 func (m *Manager) SetTrayMenu(trayMenu *menu.TrayMenu) (string, error) {
 	trayID, trayMenuKnown := m.trayMenuPointers[trayMenu]

v2/internal/messagedispatcher/dispatchclient.go

@@ -37,6 +37,7 @@ type Client interface {
 	SetTrayMenu(trayMenuJSON string)
 	UpdateTrayMenuLabel(JSON string)
 	UpdateContextMenu(contextMenuJSON string)
+	DeleteTrayMenuByID(id string)
 }
 
 // DispatchClient is what the frontends use to interface with the

v2/internal/messagedispatcher/messagedispatcher.go

@@ -527,6 +527,17 @@ func (d *Dispatcher) processMenuMessage(result *servicebus.Message) {
 		for _, client := range d.clients {
 			client.frontend.UpdateTrayMenuLabel(updatedTrayMenuLabel)
 		}
+	case "deletetraymenu":
+		traymenuid, ok := result.Data().(string)
+		if !ok {
+			d.logger.Error("Invalid data for 'menufrontend:updatetraymenulabel' : %#v",
+				result.Data())
+			return
+		}
+
+		for _, client := range d.clients {
+			client.frontend.DeleteTrayMenuByID(traymenuid)
+		}
 
 	default:
 		d.logger.Error("Unknown menufrontend command: %s", command)

v2/internal/runtime/js/runtime/bridge.js

@@ -620,7 +620,7 @@
     }
 
     /** Menubar **/
-    const menuVisible = writable(true);
+    const menuVisible = writable(false);
 
     /** Trays **/
 
@@ -649,6 +649,18 @@
         });
     }
 
+    function deleteTrayMenu(id) {
+        trays.update((current) => {
+            // Remove existing if it exists, else add
+            const index = current.findIndex(item => item.ID === id);
+            if ( index === -1 ) {
+                return log("ERROR: Attempted to delete tray index ")
+            }
+            current.splice(index, 1);
+            return current;
+        });
+    }
+
     let selectedMenu = writable(null);
 
     function fade(node, { delay = 0, duration = 400, easing = identity } = {}) {
@@ -1220,11 +1232,11 @@
 
     function get_each_context$1(ctx, list, i) {
     	const child_ctx = ctx.slice();
-    	child_ctx[8] = list[i];
+    	child_ctx[9] = list[i];
     	return child_ctx;
     }
 
-    // (29:0) {#if $menuVisible }
+    // (38:0) {#if $menuVisible }
     function create_if_block$3(ctx) {
     	let div;
     	let span1;
@@ -1336,11 +1348,11 @@
     	};
     }
 
-    // (32:4) {#each $trays as tray}
+    // (41:4) {#each $trays as tray}
     function create_each_block$1(ctx) {
     	let traymenu;
     	let current;
-    	traymenu = new TrayMenu({ props: { tray: /*tray*/ ctx[8] } });
+    	traymenu = new TrayMenu({ props: { tray: /*tray*/ ctx[9] } });
 
     	return {
     		c() {
@@ -1352,7 +1364,7 @@
     		},
     		p(ctx, dirty) {
     			const traymenu_changes = {};
-    			if (dirty & /*$trays*/ 4) traymenu_changes.tray = /*tray*/ ctx[8];
+    			if (dirty & /*$trays*/ 4) traymenu_changes.tray = /*tray*/ ctx[9];
     			traymenu.$set(traymenu_changes);
     		},
     		i(local) {
@@ -1373,6 +1385,8 @@
     function create_fragment$3(ctx) {
     	let if_block_anchor;
     	let current;
+    	let mounted;
+    	let dispose;
     	let if_block = /*$menuVisible*/ ctx[1] && create_if_block$3(ctx);
 
     	return {
@@ -1384,6 +1398,11 @@
     			if (if_block) if_block.m(target, anchor);
     			insert(target, if_block_anchor, anchor);
     			current = true;
+
+    			if (!mounted) {
+    				dispose = listen(window, "keydown", /*handleKeydown*/ ctx[3]);
+    				mounted = true;
+    			}
     		},
     		p(ctx, [dirty]) {
     			if (/*$menuVisible*/ ctx[1]) {
@@ -1421,6 +1440,8 @@
     		d(detaching) {
     			if (if_block) if_block.d(detaching);
     			if (detaching) detach(if_block_anchor);
+    			mounted = false;
+    			dispose();
     		}
     	};
     }
@@ -1440,7 +1461,7 @@
     	onMount(() => {
     		const interval = setInterval(
     			() => {
-    				$$invalidate(3, time = new Date());
+    				$$invalidate(4, time = new Date());
     			},
     			1000
     		);
@@ -1450,33 +1471,52 @@
     		};
     	});
 
+    	function handleKeydown(e) {
+    		// Backtick toggle
+    		if (e.keyCode == 192) {
+    			menuVisible.update(current => {
+    				return !current;
+    			});
+    		}
+    	}
+
     	$$self.$$.update = () => {
-    		if ($$self.$$.dirty & /*time*/ 8) {
-    			$$invalidate(4, day = time.toLocaleString("default", { weekday: "short" }));
+    		if ($$self.$$.dirty & /*time*/ 16) {
+    			$$invalidate(5, day = time.toLocaleString("default", { weekday: "short" }));
     		}
 
-    		if ($$self.$$.dirty & /*time*/ 8) {
-    			$$invalidate(5, dom = time.getDate());
+    		if ($$self.$$.dirty & /*time*/ 16) {
+    			$$invalidate(6, dom = time.getDate());
     		}
 
-    		if ($$self.$$.dirty & /*time*/ 8) {
-    			$$invalidate(6, mon = time.toLocaleString("default", { month: "short" }));
+    		if ($$self.$$.dirty & /*time*/ 16) {
+    			$$invalidate(7, mon = time.toLocaleString("default", { month: "short" }));
     		}
 
-    		if ($$self.$$.dirty & /*time*/ 8) {
-    			$$invalidate(7, currentTime = time.toLocaleString("en-US", {
+    		if ($$self.$$.dirty & /*time*/ 16) {
+    			$$invalidate(8, currentTime = time.toLocaleString("en-US", {
     				hour: "numeric",
     				minute: "numeric",
     				hour12: true
     			}).toLowerCase());
     		}
 
-    		if ($$self.$$.dirty & /*day, dom, mon, currentTime*/ 240) {
+    		if ($$self.$$.dirty & /*day, dom, mon, currentTime*/ 480) {
     			$$invalidate(0, dateTimeString = `${day} ${dom} ${mon} ${currentTime}`);
     		}
     	};
 
-    	return [dateTimeString, $menuVisible, $trays, time, day, dom, mon, currentTime];
+    	return [
+    		dateTimeString,
+    		$menuVisible,
+    		$trays,
+    		handleKeydown,
+    		time,
+    		day,
+    		dom,
+    		mon,
+    		currentTime
+    	];
     }
 
     class Menubar extends SvelteComponent {
@@ -1638,6 +1678,11 @@
                         let trayLabelData = JSON.parse(updateTrayLabelJSON);
                         updateTrayLabel(trayLabelData);
                         break
+                    case 'D':
+                        // Delete Tray Menu
+                        const id = trayMessage.slice(1);
+                        deleteTrayMenu(id);
+                        break
                     default:
                         log('Unknown tray message: ' + message.data);
                 }

v2/internal/runtime/js/runtime/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wails/runtime",
-  "version": "1.3.9",
+  "version": "1.3.12",
   "description": "Wails V2 Javascript runtime library",
   "main": "main.js",
   "types": "runtime.d.ts",

v2/internal/runtime/js/runtime/src/Menubar.svelte

@@ -24,6 +24,15 @@
         };
     });
 
+    function handleKeydown(e) {
+        // Backtick toggle
+        if( e.keyCode == 192 ) {
+            menuVisible.update( (current) => {
+                return !current;
+            });
+        }
+    }
+
 </script>
 
 {#if $menuVisible }
@@ -37,6 +46,8 @@
     </div>
 {/if}
 
+<svelte:window on:keydown={handleKeydown}/>
+
 <style>
 
     .tray-menus {

v2/internal/runtime/js/runtime/src/store.js

@@ -13,7 +13,7 @@ export function hideOverlay() {
 }
 
 /** Menubar **/
-export const menuVisible = writable(true);
+export const menuVisible = writable(false);
 
 export function showMenuBar() {
     menuVisible.set(true);
@@ -49,4 +49,16 @@ export function updateTrayLabel(tray) {
     })
 }
 
+export function deleteTrayMenu(id) {
+    trays.update((current) => {
+        // Remove existing if it exists, else add
+        const index = current.findIndex(item => item.ID === id);
+        if ( index === -1 ) {
+            return log("ERROR: Attempted to delete tray index ", id, "but it doesn't exist")
+        }
+        current.splice(index, 1);
+        return current;
+    })
+}
+
 export let selectedMenu = writable(null);

v2/internal/runtime/js/runtime/src/websocket.js

@@ -10,7 +10,7 @@ The lightweight framework for web-like apps
 /* jshint esversion: 6 */
 
 
-import {setTray, hideOverlay, showOverlay, updateTrayLabel} from "./store";
+import {setTray, hideOverlay, showOverlay, updateTrayLabel, deleteTrayMenu} from "./store";
 import {log} from "./log";
 
 let websocket = null;
@@ -154,6 +154,11 @@ function handleMessage(message) {
                     let trayLabelData = JSON.parse(updateTrayLabelJSON)
                     updateTrayLabel(trayLabelData)
                     break
+                case 'D':
+                    // Delete Tray Menu
+                    const id = trayMessage.slice(1);
+                    deleteTrayMenu(id)
+                    break
                 default:
                     log('Unknown tray message: ' + message.data);
             }

v2/internal/runtime/menu.go

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

v2/internal/runtime/runtime.go

@@ -6,20 +6,19 @@ import (
 
 // Runtime is a means for the user to interact with the application at runtime
 type Runtime struct {
-	Browser          Browser
-	Events           Events
-	Window           Window
-	Dialog           Dialog
-	System           System
-	Menu             Menu
-	Store            *StoreProvider
-	Log              Log
-	bus              *servicebus.ServiceBus
-	shutdownCallback func()
+	Browser Browser
+	Events  Events
+	Window  Window
+	Dialog  Dialog
+	System  System
+	Menu    Menu
+	Store   *StoreProvider
+	Log     Log
+	bus     *servicebus.ServiceBus
 }
 
 // New creates a new runtime
-func New(serviceBus *servicebus.ServiceBus, shutdownCallback func()) *Runtime {
+func New(serviceBus *servicebus.ServiceBus) *Runtime {
 	result := &Runtime{
 		Browser: newBrowser(),
 		Events:  newEvents(serviceBus),
@@ -36,11 +35,6 @@ func New(serviceBus *servicebus.ServiceBus, shutdownCallback func()) *Runtime {
 
 // Quit the application
 func (r *Runtime) Quit() {
-	// Call back to user's shutdown method if defined
-	if r.shutdownCallback != nil {
-		r.shutdownCallback()
-	}
-
 	// Start shutdown of Wails
 	r.bus.Publish("quit", "runtime.Quit()")
 }

v2/internal/signal/signal.go

@@ -26,25 +26,20 @@ type Manager struct {
 	ctx    context.Context
 	cancel context.CancelFunc
 
-	// The shutdown callback to notify the user's app that a shutdown
-	// has started
-	shutdownCallback func()
-
 	// Parent waitgroup
 	wg *sync.WaitGroup
 }
 
 // NewManager creates a new signal manager
-func NewManager(ctx context.Context, cancel context.CancelFunc, bus *servicebus.ServiceBus, logger *logger.Logger, shutdownCallback func()) (*Manager, error) {
+func NewManager(ctx context.Context, cancel context.CancelFunc, bus *servicebus.ServiceBus, logger *logger.Logger) (*Manager, error) {
 
 	result := &Manager{
-		bus:              bus,
-		logger:           logger.CustomLogger("Event Manager"),
-		signalchannel:    make(chan os.Signal, 2),
-		ctx:              ctx,
-		cancel:           cancel,
-		shutdownCallback: shutdownCallback,
-		wg:               ctx.Value("waitgroup").(*sync.WaitGroup),
+		bus:           bus,
+		logger:        logger.CustomLogger("Event Manager"),
+		signalchannel: make(chan os.Signal, 2),
+		ctx:           ctx,
+		cancel:        cancel,
+		wg:            ctx.Value("waitgroup").(*sync.WaitGroup),
 	}
 
 	return result, nil
@@ -67,11 +62,6 @@ func (m *Manager) Start() {
 			m.logger.Trace("Ctrl+C detected. Shutting down...")
 			m.bus.Publish("quit", "ctrl-c pressed")
 
-			// Shutdown app first
-			if m.shutdownCallback != nil {
-				m.shutdownCallback()
-			}
-
 			// Start shutdown of Wails
 			m.cancel()
 

v2/internal/subsystem/menu.go

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

v2/internal/subsystem/runtime.go

@@ -37,7 +37,7 @@ type Runtime struct {
 }
 
 // NewRuntime creates a new runtime subsystem
-func NewRuntime(ctx context.Context, bus *servicebus.ServiceBus, logger *logger.Logger, startupCallback func(*runtime.Runtime), shutdownCallback func()) (*Runtime, error) {
+func NewRuntime(ctx context.Context, bus *servicebus.ServiceBus, logger *logger.Logger, startupCallback func(*runtime.Runtime)) (*Runtime, error) {
 
 	// Subscribe to log messages
 	runtimeChannel, err := bus.Subscribe("runtime:")
@@ -52,13 +52,12 @@ func NewRuntime(ctx context.Context, bus *servicebus.ServiceBus, logger *logger.
 	}
 
 	result := &Runtime{
-		runtimeChannel:   runtimeChannel,
-		hooksChannel:     hooksChannel,
-		logger:           logger.CustomLogger("Runtime Subsystem"),
-		runtime:          runtime.New(bus, shutdownCallback),
-		startupCallback:  startupCallback,
-		shutdownCallback: shutdownCallback,
-		ctx:              ctx,
+		runtimeChannel:  runtimeChannel,
+		hooksChannel:    hooksChannel,
+		logger:          logger.CustomLogger("Runtime Subsystem"),
+		runtime:         runtime.New(bus),
+		startupCallback: startupCallback,
+		ctx:             ctx,
 	}
 
 	return result, nil

v2/internal/templates/templates/vanilla/basic.tmpl.go

@@ -12,20 +12,19 @@ type Basic struct {
 }
 
 // newBasic creates a new Basic application struct
-func newBasic() *Basic {
+func NewBasic() *Basic {
 	return &Basic{}
 }
 
-// WailsInit is called at application startup
-func (b *Basic) WailsInit(runtime *wails.Runtime) error {
+// startup is called at application startup
+func (b *Basic) startup(runtime *wails.Runtime) {
 	// Perform your setup here
 	b.runtime = runtime
 	runtime.Window.SetTitle("{{.ProjectName}}")
-	return nil
 }
 
-// WailsShutdown is called at application termination
-func (b *Basic) WailsShutdown() {
+// shutdown is called at application termination
+func (b *Basic) shutdown() {
 	// Perform your teardown here
 }
 

v2/internal/templates/templates/vanilla/frontend/index.html

@@ -4,7 +4,7 @@
   <link rel="stylesheet" href="/main.css">
 </head>
 
-<body>
+<body data-wails-drag>
   <div id="logo"></div>
   <div id="input">
     <input id="name" type="text"></input>

v2/internal/templates/templates/vanilla/main.tmpl.go

@@ -1,21 +1,38 @@
 package main
 
 import (
-	"github.com/wailsapp/wails/v2"
 	"log"
+
+	"github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2/pkg/logger"
+	"github.com/wailsapp/wails/v2/pkg/menu"
+	"github.com/wailsapp/wails/v2/pkg/options"
+	"github.com/wailsapp/wails/v2/pkg/options/mac"
 )
 
 func main() {
 
 	// Create application with options
-	app, err := wails.CreateApp("{{.ProjectName}}", 1024, 768)
-	if err != nil {
-		log.Fatal(err)
-	}
+	app := NewBasic()
 
-	app.Bind(newBasic())
-
-	err = app.Run()
+	err := wails.Run(&options.App{
+		Title:         "{{.ProjectName}}",
+		Width:         800,
+		Height:        600,
+		DisableResize: true,
+		Mac: &mac.Options{
+			WebviewIsTransparent:          true,
+			WindowBackgroundIsTranslucent: true,
+			TitleBar:                      mac.TitleBarHiddenInset(),
+			Menu:                          menu.DefaultMacMenu(),
+		},
+		LogLevel: logger.DEBUG,
+		Startup:  app.startup,
+		Shutdown: app.shutdown,
+		Bind: []interface{}{
+			app,
+		},
+	})
 	if err != nil {
 		log.Fatal(err)
 	}

v2/pkg/commands/build/base.go

@@ -145,6 +145,13 @@ func (b *BaseBuilder) CleanUp() {
 // CompileProject compiles the project
 func (b *BaseBuilder) CompileProject(options *Options) error {
 
+	// Run go mod tidy first
+	cmd := exec.Command(options.Compiler, "mod", "tidy")
+	err := cmd.Run()
+	if err != nil {
+		return err
+	}
+
 	// Default go build command
 	commands := slicer.String([]string{"build"})
 
@@ -188,7 +195,7 @@ func (b *BaseBuilder) CompileProject(options *Options) error {
 
 	// Get application build directory
 	appDir := options.BuildDirectory
-	err := cleanBuildDirectory(options)
+	err = cleanBuildDirectory(options)
 	if err != nil {
 		return err
 	}
@@ -211,7 +218,7 @@ func (b *BaseBuilder) CompileProject(options *Options) error {
 	options.CompiledBinary = compiledBinary
 
 	// Create the command
-	cmd := exec.Command(options.Compiler, commands.AsSlice()...)
+	cmd = exec.Command(options.Compiler, commands.AsSlice()...)
 
 	// Set the directory
 	cmd.Dir = b.projectData.Path

v2/pkg/commands/build/build.go

@@ -38,6 +38,7 @@ type Options struct {
 	BuildDirectory string               // Directory to use for building the application
 	CompiledBinary string               // Fully qualified path to the compiled binary
 	KeepAssets     bool                 // /Keep the generated assets/files
+	AppleIdentity  string
 }
 
 // GetModeAsString returns the current mode as a string

v2/pkg/commands/build/packager_darwin.go

@@ -2,9 +2,11 @@ package build
 
 import (
 	"bytes"
+	"fmt"
 	"image"
 	"io/ioutil"
 	"os"
+	"os/exec"
 	"path"
 	"path/filepath"
 	"strings"
@@ -52,6 +54,12 @@ func packageApplication(options *Options) error {
 		return err
 	}
 
+	// Sign app if needed
+	err = signApplication(options)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -176,3 +184,21 @@ func processApplicationIcon(resourceDir string, iconsDir string) (err error) {
 	}()
 	return icns.Encode(dest, srcImg)
 }
+
+func signApplication(options *Options) error {
+	bundlename := filepath.Join(options.BuildDirectory, options.ProjectData.Name+".app")
+	identity := fmt.Sprintf(`"%s"`, options.AppleIdentity)
+	cmd := exec.Command("codesign", "--deep", "--force", "--verbose", "--sign", identity, bundlename)
+	var stdo, stde bytes.Buffer
+	cmd.Stdout = &stdo
+	cmd.Stderr = &stde
+
+	// Run command
+	err := cmd.Run()
+
+	// Format error if we have one
+	if err != nil {
+		return fmt.Errorf("%s\n%s", err, string(stde.Bytes()))
+	}
+	return nil
+}

v2/pkg/menu/keys/keys.go

@@ -10,15 +10,15 @@ type Modifier string
 
 const (
 	// CmdOrCtrlKey represents Command on Mac and Control on other platforms
-	CmdOrCtrlKey Modifier = "CmdOrCtrl"
+	CmdOrCtrlKey Modifier = "cmdorctrl"
 	// OptionOrAltKey represents Option on Mac and Alt on other platforms
-	OptionOrAltKey Modifier = "OptionOrAlt"
+	OptionOrAltKey Modifier = "optionoralt"
 	// ShiftKey represents the shift key on all systems
-	ShiftKey Modifier = "Shift"
+	ShiftKey Modifier = "shift"
 	// SuperKey represents Command on Mac and the Windows key on the other platforms
-	SuperKey Modifier = "Super"
+	SuperKey Modifier = "super"
 	// ControlKey represents the control key on all systems
-	ControlKey Modifier = "Control"
+	ControlKey Modifier = "ctrl"
 )
 
 var modifierMap = map[string]Modifier{

v2/pkg/options/mac/mac.go

@@ -2,6 +2,14 @@ package mac
 
 import "github.com/wailsapp/wails/v2/pkg/menu"
 
+type ActivationPolicy int
+
+const (
+	NSApplicationActivationPolicyRegular    ActivationPolicy = 0
+	NSApplicationActivationPolicyAccessory  ActivationPolicy = 1
+	NSApplicationActivationPolicyProhibited ActivationPolicy = 2
+)
+
 // Options are options specific to Mac
 type Options struct {
 	TitleBar                      *TitleBar
@@ -11,4 +19,5 @@ type Options struct {
 	Menu                          *menu.Menu
 	TrayMenus                     []*menu.TrayMenu
 	ContextMenus                  []*menu.ContextMenu
+	ActivationPolicy              ActivationPolicy
 }