v2.0.0-alpha.37

v2/cmd/wails/version.go

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

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:"));
 	);
 }
 
@@ -1112,7 +1113,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) {
@@ -1812,6 +1813,10 @@ 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) {
@@ -1883,6 +1888,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/runtime/js/runtime/bridge.js

@@ -620,7 +620,7 @@
     }
 
     /** Menubar **/
-    const menuVisible = writable(true);
+    const menuVisible = writable(false);
 
     /** Trays **/
 
@@ -1220,11 +1220,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 +1336,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 +1352,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 +1373,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 +1386,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 +1428,8 @@
     		d(detaching) {
     			if (if_block) if_block.d(detaching);
     			if (detaching) detach(if_block_anchor);
+    			mounted = false;
+    			dispose();
     		}
     	};
     }
@@ -1440,7 +1449,7 @@
     	onMount(() => {
     		const interval = setInterval(
     			() => {
-    				$$invalidate(3, time = new Date());
+    				$$invalidate(4, time = new Date());
     			},
     			1000
     		);
@@ -1450,33 +1459,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 {

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

@@ -1,6 +1,6 @@
 {
   "name": "@wails/runtime",
-  "version": "1.3.9",
+  "version": "1.3.10",
   "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);

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
 }