github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-11 06:29:29 +08:00
Code Projects Activity

Better font name support

Browse Source
This commit is contained in:
Lea Anthony 2021-03-21 20:57:41 +11:00
parent 92ebf506dd
commit e5f2746810
No known key found for this signature in database
GPG Key ID: 33DAF7BB90A58405
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
v2/internal/ffenestri/menu_darwin.c
View File

@ -587,11 +587,8 @@ id createAttributedString(const char* title, const char* fontName, int fontSize,
// Check if valid // Check if valid
id fontNameAsNSString = str(fontName); id fontNameAsNSString = str(fontName);
id fontsOnSystem = msg(msg(c("NSFontManager"), s("sharedFontManager")), s("availableFonts")); font = msg(c("NSFont"), s("fontWithName:size:"), fontNameAsNSString, fontSizeFloat);
bool valid = msg(fontsOnSystem, s("containsObject:"), fontNameAsNSString); if( font == NULL ) {
if( valid ) {
font = msg(c("NSFont"), s("fontWithName:size:"), fontNameAsNSString, fontSizeFloat);
} else {
bool supportsMonospacedDigitSystemFont = (bool) msg(c("NSFont"), s("respondsToSelector:"), s("monospacedDigitSystemFontOfSize:weight:")); bool supportsMonospacedDigitSystemFont = (bool) msg(c("NSFont"), s("respondsToSelector:"), s("monospacedDigitSystemFontOfSize:weight:"));
if( supportsMonospacedDigitSystemFont ) { if( supportsMonospacedDigitSystemFont ) {
font = msg(c("NSFont"), s("monospacedDigitSystemFontOfSize:weight:"), fontSizeFloat, NSFontWeightRegular); font = msg(c("NSFont"), s("monospacedDigitSystemFontOfSize:weight:"), fontSizeFloat, NSFontWeightRegular);
@ -603,7 +600,6 @@ id createAttributedString(const char* title, const char* fontName, int fontSize,
// Add font to dictionary // Add font to dictionary
msg(dictionary, s("setObject:forKey:"), font, lookupStringConstant(str("NSFontAttributeName"))); msg(dictionary, s("setObject:forKey:"), font, lookupStringConstant(str("NSFontAttributeName")));
// Add offset to dictionary
id offset = msg(c("NSNumber"), s("numberWithFloat:"), 0.0); id offset = msg(c("NSNumber"), s("numberWithFloat:"), 0.0);
msg(dictionary, s("setObject:forKey:"), offset, lookupStringConstant(str("NSBaselineOffsetAttributeName"))); msg(dictionary, s("setObject:forKey:"), offset, lookupStringConstant(str("NSBaselineOffsetAttributeName")));