v2.0.0-alpha.48

v2/cmd/wails/version.go

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

v2/internal/ffenestri/ffenestri_darwin.c

@@ -1166,26 +1166,28 @@ void getURL(id self, SEL selector, id event, id replyEvent) {
 
 
 void createDelegate(struct Application *app) {
+
     // Define delegate
-	Class delegateClass = objc_allocateClassPair((Class) c("NSObject"), "AppDelegate", 0);
-	bool resultAddProtoc = class_addProtocol(delegateClass, objc_getProtocol("NSApplicationDelegate"));
-    class_addMethod(delegateClass, s("applicationShouldTerminateAfterLastWindowClosed:"), (IMP) no, "c@:@");
-	class_addMethod(delegateClass, s("applicationWillFinishLaunching:"), (IMP) willFinishLaunching, "v@:@");
+	Class appDelegate = objc_allocateClassPair((Class) c("NSResponder"), "AppDelegate", 0);
+	class_addProtocol(appDelegate, objc_getProtocol("NSTouchBarProvider"));
+
+	class_addMethod(appDelegate, s("applicationShouldTerminateAfterLastWindowClosed:"), (IMP) no, "c@:@");
+	class_addMethod(appDelegate, s("applicationWillFinishLaunching:"), (IMP) willFinishLaunching, "v@:@");
 
 	// All Menu Items use a common callback
-    class_addMethod(delegateClass, s("menuItemCallback:"), (IMP)menuItemCallback, "v@:@");
+    class_addMethod(appDelegate, s("menuItemCallback:"), (IMP)menuItemCallback, "v@:@");
 
     // If there are URL Handlers, register the callback method
     if( app->hasURLHandlers ) {
-    	class_addMethod(delegateClass, s("getUrl:withReplyEvent:"), (IMP) getURL, "i@:@@");
+    	class_addMethod(appDelegate, s("getUrl:withReplyEvent:"), (IMP) getURL, "i@:@@");
     }
 
 	// Script handler
-	class_addMethod(delegateClass, s("userContentController:didReceiveScriptMessage:"), (IMP) messageHandler, "v@:@@");
-	objc_registerClassPair(delegateClass);
+	class_addMethod(appDelegate, s("userContentController:didReceiveScriptMessage:"), (IMP) messageHandler, "v@:@@");
+	objc_registerClassPair(appDelegate);
 
 	// Create delegate
-	id delegate = msg((id)delegateClass, s("new"));
+	id delegate = msg((id)appDelegate, s("new"));
 	objc_setAssociatedObject(delegate, "application", (id)app, OBJC_ASSOCIATION_ASSIGN);
 
     // If there are URL Handlers, register a listener for them
@@ -1195,7 +1197,7 @@ void createDelegate(struct Application *app) {
     }
 
 	// Theme change listener
-	class_addMethod(delegateClass, s("themeChanged:"), (IMP) themeChanged, "v@:@@");
+	class_addMethod(appDelegate, s("themeChanged:"), (IMP) themeChanged, "v@:@@");
 
 	// Get defaultCenter
 	id defaultCenter = msg(c("NSDistributedNotificationCenter"), s("defaultCenter"));

v2/internal/ffenestri/traymenu_darwin.c

@@ -82,8 +82,18 @@ void UpdateTrayIcon(TrayMenu *trayMenu) {
     }
 
     id trayImage = hashmap_get(&trayIconCache, trayMenu->icon, strlen(trayMenu->icon));
+
+    // If we don't have the image in the icon cache then assume it's base64 encoded image data
+    if (trayImage == NULL) {
+        id data = ALLOC("NSData");
+        id imageData = msg(data, s("initWithBase64EncodedString:options:"), str(trayMenu->icon), 0);
+        trayImage = ALLOC("NSImage");
+        msg(trayImage, s("initWithData:"), imageData);
+    }
+
     msg(statusBarButton, s("setImagePosition:"), trayMenu->trayIconPosition);
     msg(statusBarButton, s("setImage:"), trayImage);
+
 }
 
 void ShowTrayMenu(TrayMenu* trayMenu) {

v2/internal/subsystem/url.go

@@ -68,6 +68,10 @@ func (u *URL) Start() error {
 				u.wg.Done()
 				return
 			case urlMessage := <-u.urlChannel:
+				// Guard against nil messages
+				if urlMessage == nil {
+					continue
+				}
 				messageType := strings.TrimPrefix(urlMessage.Topic(), "url:")
 				switch messageType {
 				case "handler":

v2/pkg/menu/keys/keys.go

@@ -30,7 +30,8 @@ var modifierMap = map[string]Modifier{
 }
 
 func parseModifier(text string) (*Modifier, error) {
-	result, valid := modifierMap[text]
+	lowertext := strings.ToLower(text)
+	result, valid := modifierMap[lowertext]
 	if !valid {
 		return nil, fmt.Errorf("'%s' is not a valid modifier", text)
 	}