v2.0.0-alpha.63

v2/cmd/wails/version.go

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

v2/internal/ffenestri/menu_darwin.c

@@ -189,6 +189,9 @@ id processAcceleratorKey(const char *key) {
     if( STREQ(key, "return") ) {
         return strunicode(0x000d);
     }
+    if( STREQ(key, "enter") ) {
+        return strunicode(0x000d);
+    }
     if( STREQ(key, "escape") ) {
         return strunicode(0x001b);
     }
@@ -578,30 +581,26 @@ id processCheckboxMenuItem(Menu *menu, id parentmenu, const char *title, const c
 
 id createAttributedString(const char* title, const char* fontName, int fontSize, const char* RGBA) {
 
-    // Process Menu Item attributes
+    // Create new Dictionary
     id dictionary = ALLOC_INIT("NSMutableDictionary");
-
-    // Process font
     CGFloat fontSizeFloat = (CGFloat)fontSize;
 
-    // Check if valid
-    id fontNameAsNSString = str(fontName);
-    id font = ((id(*)(id, SEL, id, CGFloat))objc_msgSend)(c("NSFont"), s("fontWithName:size:"), fontNameAsNSString, fontSizeFloat);
-    if( font == NULL ) {
-        bool supportsMonospacedDigitSystemFont = (bool) ((id(*)(id, SEL, SEL))objc_msgSend)(c("NSFont"), s("respondsToSelector:"), s("monospacedDigitSystemFontOfSize:weight:"));
-        if( supportsMonospacedDigitSystemFont ) {
-            font = ((id(*)(id, SEL, CGFloat, CGFloat))objc_msgSend)(c("NSFont"), s("monospacedDigitSystemFontOfSize:weight:"), fontSizeFloat, (CGFloat)NSFontWeightRegular);
-        } else {
-            font = ((id(*)(id, SEL, CGFloat))objc_msgSend)(c("NSFont"), s("menuFontOfSize:"), fontSizeFloat);
+    // Use default font
+    id font = ((id(*)(id, SEL, CGFloat))objc_msgSend)(c("NSFont"), s("menuBarFontOfSize:"), fontSizeFloat);
+
+    // Check user supplied font
+    if( STR_HAS_CHARS(fontName) ) {
+        id fontNameAsNSString = str(fontName);
+        id userFont = ((id(*)(id, SEL, id, CGFloat))objc_msgSend)(c("NSFont"), s("fontWithName:size:"), fontNameAsNSString, fontSizeFloat);
+        if( userFont != NULL ) {
+            font = userFont;
         }
     }
 
     // Add font to dictionary
     id fan = lookupStringConstant(str("NSFontAttributeName"));
     msg_id_id(dictionary, s("setObject:forKey:"), font, fan);
-    id offset = msg_float(c("NSNumber"), s("numberWithFloat:"), (float)0.0);
-    id offsetAttrName = lookupStringConstant(str("NSBaselineOffsetAttributeName"));
-    msg_id_id(dictionary, s("setObject:forKey:"), offset, offsetAttrName);
+
     // RGBA
     if( RGBA != NULL && strlen(RGBA) > 0) {
         unsigned short r, g, b, a;

v2/pkg/commands/build/internal/assets/README.md

@@ -49,4 +49,4 @@ Example:
 
 ## Mac
 
-The `mac` directory holds files specific to Mac builds, such as `info.plist`. These may be edited and used as part of the build.
+The `mac` directory holds files specific to Mac builds, such as `Info.plist`. These may be edited and used as part of the build.

v2/pkg/commands/build/packager_darwin.go

@@ -42,7 +42,7 @@ func packageApplication(options *Options) error {
 		return errors.Wrap(err, "Cannot move file: "+options.ProjectData.OutputFilename)
 	}
 
-	// Generate info.plist
+	// Generate Info.plist
 	err = processPList(options, contentsDirectory)
 	if err != nil {
 		return err
@@ -68,7 +68,7 @@ func packageApplication(options *Options) error {
 func processPList(options *Options, contentsDirectory string) error {
 
 	// Check if plist already exists in project dir
-	plistFile := filepath.Join(options.ProjectData.AssetsDir, "mac", "info.plist")
+	plistFile := filepath.Join(options.ProjectData.AssetsDir, "mac", "Info.plist")
 
 	// If the file doesn't exist, generate it
 	if !fs.FileExists(plistFile) {
@@ -79,7 +79,7 @@ func processPList(options *Options, contentsDirectory string) error {
 	}
 
 	// Copy it to the contents directory
-	targetFile := filepath.Join(contentsDirectory, "info.plist")
+	targetFile := filepath.Join(contentsDirectory, "Info.plist")
 	return fs.CopyFile(plistFile, targetFile)
 }
 
@@ -88,11 +88,11 @@ func generateDefaultPlist(options *Options, targetPlistFile string) error {
 	exe := defaultString(options.OutputFile, name)
 	version := "1.0.0"
 	author := defaultString(options.ProjectData.Author.Name, "Anonymous")
-	packageID := strings.Join([]string{"wails", name, version}, ".")
+	packageID := strings.Join([]string{"wails", name}, ".")
 	plistData := newPlistData(name, exe, packageID, version, author)
 
 	tmpl := template.New("infoPlist")
-	plistTemplate := fs.RelativePath("./internal/packager/darwin/info.plist")
+	plistTemplate := fs.RelativePath("./internal/packager/darwin/Info.plist")
 	infoPlist, err := ioutil.ReadFile(plistTemplate)
 	if err != nil {
 		return errors.Wrap(err, "Cannot open plist template")

v2/pkg/menu/keys/parser.go

@@ -8,7 +8,7 @@ import (
 	"github.com/leaanthony/slicer"
 )
 
-var namedKeys = slicer.String([]string{"backspace", "tab", "return", "escape", "left", "right", "up", "down", "space", "delete", "home", "end", "page up", "page down", "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", "f32", "f33", "f34", "f35", "numlock"})
+var namedKeys = slicer.String([]string{"backspace", "tab", "return", "enter", "escape", "left", "right", "up", "down", "space", "delete", "home", "end", "page up", "page down", "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", "f32", "f33", "f34", "f35", "numlock"})
 
 func parseKey(key string) (string, bool) {
 

v2/test/kitchensink/.gitignore

@@ -1 +1 @@
-info.plist
+Info.plist