v2.0.0-alpha.15

runtime/js/core/browser.js

@@ -26,7 +26,7 @@ export function OpenURL(url) {
  * Opens the given filename using the system's default file handler
  *
  * @export
- * @param {sting} filename
+ * @param {string} filename
  * @returns
  */
 export function OpenFile(filename) {

runtime/js/core/calls.js

@@ -62,7 +62,7 @@ if (window.crypto) {
 export function Call(bindingName, data, timeout) {
 
 	// Timeout infinite by default
-	if (timeout == null || timeout == undefined) {
+	if (timeout == null) {
 		timeout = 0;
 	}
 

runtime/js/core/ipc.js

@@ -45,7 +45,7 @@ function Invoke(message) {
  *
  * @export
  * @param {string} type
- * @param {string} payload
+ * @param {Object} payload
  * @param {string=} callbackID
  */
 export function SendMessage(type, payload, callbackID) {

v2/cmd/wails/version.go

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

v2/internal/ffenestri/ffenestri_darwin.c

@@ -150,6 +150,12 @@ void Fatal(struct Application *app, const char *message, ... ) {
   va_end(args);
 }
 
+// Requires NSString input EG lookupStringConstant(str("NSFontAttributeName"))
+void* lookupStringConstant(id constantName) {
+    void ** dataPtr = CFBundleGetDataPointerForName(CFBundleGetBundleWithIdentifier(str("com.apple.AppKit")), (CFStringRef) constantName);
+    return (dataPtr ? *dataPtr : nil);
+}
+
 bool isRetina(struct Application *app) {
 	CGFloat scale = GET_BACKINGSCALEFACTOR(app->mainWindow);
 	if( (int)scale == 1 ) {

v2/internal/ffenestri/ffenestri_darwin.go

@@ -2,7 +2,7 @@ package ffenestri
 
 /*
 #cgo darwin CFLAGS: -DFFENESTRI_DARWIN=1
-#cgo darwin LDFLAGS: -framework WebKit -lobjc
+#cgo darwin LDFLAGS: -framework WebKit -framework CoreFoundation -lobjc
 
 #include "ffenestri.h"
 #include "ffenestri_darwin.h"

v2/internal/ffenestri/ffenestri_darwin.h

@@ -6,6 +6,7 @@
 #define OBJC_OLD_DISPATCH_PROTOTYPES 1
 #include <objc/objc-runtime.h>
 #include <CoreGraphics/CoreGraphics.h>
+#include <CoreFoundation/CoreFoundation.h>
 #include "json.h"
 #include "hashmap.h"
 #include "stdlib.h"
@@ -20,7 +21,6 @@
 #define strunicode(input) msg(c("NSString"), s("stringWithFormat:"), str("%C"), (unsigned short)input)
 #define cstr(input) (const char *)msg(input, s("UTF8String"))
 #define url(input) msg(c("NSURL"), s("fileURLWithPath:"), str(input))
-
 #define ALLOC(classname) msg(c(classname), s("alloc"))
 #define ALLOC_INIT(classname) msg(msg(c(classname), s("alloc")), s("init"))
 #define GET_FRAME(receiver) ((CGRect(*)(id, SEL))objc_msgSend_stret)(receiver, s("frame"))
@@ -110,4 +110,6 @@ 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* lookupStringConstant(id constantName);
+
 #endif

v2/internal/ffenestri/menu_darwin.c

@@ -5,6 +5,7 @@
 #include "ffenestri_darwin.h"
 #include "menu_darwin.h"
 #include "contextmenus_darwin.h"
+#include "common.h"
 
 // NewMenu creates a new Menu struct, saving the given menu structure as JSON
 Menu* NewMenu(JsonNode *menuData) {
@@ -63,8 +64,6 @@ MenuItemCallbackData* CreateMenuItemCallbackData(Menu *menu, id menuItem, const
     return result;
 }
 
-
-
 void DeleteMenu(Menu *menu) {
 
     // Free menu item hashmap
@@ -576,7 +575,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, const char* image, const char* fontName, int fontSize, const char* RGBA) {
     id item = ALLOC("NSMenuItem");
 
     // Create a MenuItemCallbackData
@@ -589,6 +588,73 @@ id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char
     msg(item, s("initWithTitle:action:keyEquivalent:"), str(title),
         s("menuItemCallback:"), key);
 
+    if( tooltip != NULL ) {
+        msg(item, s("setToolTip:"), str(tooltip));
+    }
+
+    // Process image
+    if( image != NULL && strlen(image) > 0) {
+        id data = ALLOC("NSData");
+        id imageData = msg(data, s("initWithBase64EncodedString:options:"), str(image), 0);
+        id nsimage = ALLOC("NSImage");
+        msg(nsimage, s("initWithData:"), imageData);
+        msg(item, s("setImage:"), nsimage);
+    }
+
+    // Process Menu Item attributes
+    id dictionary = ALLOC_INIT("NSMutableDictionary");
+
+    // Process font
+    id font;
+    CGFloat fontSizeFloat = (CGFloat)fontSize;
+
+    // Check if valid
+    id fontNameAsNSString = str(fontName);
+    id fontsOnSystem = msg(msg(c("NSFontManager"), s("sharedFontManager")), s("availableFonts"));
+    bool valid = msg(fontsOnSystem, s("containsObject:"), fontNameAsNSString);
+    if( valid ) {
+        font = msg(c("NSFont"), s("fontWithName:size:"), fontNameAsNSString, fontSizeFloat);
+    } else {
+        bool supportsMonospacedDigitSystemFont = (bool) msg(c("NSFont"), s("respondsToSelector:"), s("monospacedDigitSystemFontOfSize:weight:"));
+        if( supportsMonospacedDigitSystemFont ) {
+            font = msg(c("NSFont"), s("monospacedDigitSystemFontOfSize:weight:"), fontSizeFloat, NSFontWeightRegular);
+        } else {
+            font = msg(c("NSFont"), s("menuFontOfSize:"), fontSizeFloat);
+        }
+    }
+
+    // Add font to dictionary
+    msg(dictionary, s("setObject:forKey:"), font, lookupStringConstant(str("NSFontAttributeName")));
+
+    // Add offset to dictionary
+    id offset = msg(c("NSNumber"), s("numberWithFloat:"), 0.0);
+    msg(dictionary, s("setObject:forKey:"), offset, lookupStringConstant(str("NSBaselineOffsetAttributeName")));
+
+    // RGBA
+    if( RGBA != NULL && strlen(RGBA) > 0) {
+        unsigned short r, g, b, a;
+
+        // white by default
+        r = g = b = a = 255;
+        int count = sscanf(RGBA, "#%02hx%02hx%02hx%02hx", &r, &g, &b, &a);
+        if (count > 0) {
+			id colour = msg(c("NSColor"), s("colorWithCalibratedRed:green:blue:alpha:"),
+								(float)r / 255.0,
+								(float)g / 255.0,
+								(float)b / 255.0,
+								(float)a / 255.0);
+            msg(dictionary, s("setObject:forKey:"), colour, lookupStringConstant(str("NSForegroundColorAttributeName")));
+            msg(colour, s("release"));
+        }
+    }
+
+    id attributedString = ALLOC("NSMutableAttributedString");
+    msg(attributedString, s("initWithString:attributes:"), str(title), dictionary);
+    msg(dictionary, s("release"));
+
+    msg(item, s("setAttributedTitle:"), attributedString);
+    msg(attributedString, s("autorelease"));
+
     msg(item, s("setEnabled:"), !disabled);
     msg(item, s("autorelease"));
 
@@ -670,6 +736,13 @@ void processMenuItem(Menu *menu, id parentMenu, JsonNode *item) {
     const char *acceleratorkey = NULL;
     const char **modifiers = NULL;
 
+    const char *tooltip = getJSONString(item, "Tooltip");
+    const char *image = getJSONString(item, "Image");
+    const char *fontName = getJSONString(item, "FontName");
+    const char *RGBA = getJSONString(item, "RGBA");
+    int fontSize = 0;
+    getJSONInt(item, "FontSize", &fontSize);
+
     // If we have an accelerator
     if( accelerator != NULL ) {
         // Get the key
@@ -702,7 +775,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, fontName, fontSize, RGBA);
         }
         else if ( STREQ(type->string_, "Separator")) {
             addSeparator(parentMenu);

v2/internal/ffenestri/menu_darwin.h

@@ -14,6 +14,21 @@ static const char *MenuTypeAsString[] = {
         "ApplicationMenu", "ContextMenu", "TrayMenu",
 };
 
+typedef struct _NSRange {
+    unsigned long location;
+    unsigned long length;
+} NSRange;
+
+#define NSFontWeightUltraLight -0.8
+#define NSFontWeightThin -0.6
+#define NSFontWeightLight -0.4
+#define NSFontWeightRegular 0
+#define NSFontWeightMedium 0.23
+#define NSFontWeightSemibold 0.3
+#define NSFontWeightBold 0.4
+#define NSFontWeightHeavy 0.56
+#define NSFontWeightBlack 0.62
+
 extern void messageFromWindowCallback(const char *);
 
 typedef struct {
@@ -90,8 +105,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, const char* fontName, int fontSize, const char* RGBA);
 void processMenuItem(Menu *menu, id parentMenu, JsonNode *item);
 void processMenuData(Menu *menu, JsonNode *menuData);
 

v2/internal/ffenestri/traymenustore_darwin.c

@@ -97,14 +97,13 @@ void UpdateTrayMenuLabelInStore(TrayMenuStore* store, const char* JSON) {
 
 void UpdateTrayMenuInStore(TrayMenuStore* store, const char* menuJSON) {
     TrayMenu* newMenu = NewTrayMenu(menuJSON);
-    DumpTrayMenu(newMenu);
+//    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);
 
@@ -112,7 +111,7 @@ void UpdateTrayMenuInStore(TrayMenuStore* store, const char* menuJSON) {
         ShowTrayMenu(newMenu);
         return;
     }
-    DumpTrayMenu(currentMenu);
+//    DumpTrayMenu(currentMenu);
 
     // Save the status bar reference
     newMenu->statusbaritem = currentMenu->statusbaritem;

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/runtime/store.go

@@ -146,9 +146,13 @@ func (s *Store) setupListener() {
 		// Resetting the curent data will resync
 		s.resync()
 	})
+
+	// Do initial resync
+	s.resync()
 }
 
 func (s *Store) resync() {
+
 	// Stringify data
 	newdata, err := json.Marshal(s.data.Interface())
 	if err != nil {

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/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/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=