From e5f2746810c581cbf24ffe4df1dc3086a37e9062 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Sun, 21 Mar 2021 20:57:41 +1100 Subject: [PATCH] Better font name support --- v2/internal/ffenestri/menu_darwin.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/v2/internal/ffenestri/menu_darwin.c b/v2/internal/ffenestri/menu_darwin.c index 6f384d3a8..a6d144d1b 100644 --- a/v2/internal/ffenestri/menu_darwin.c +++ b/v2/internal/ffenestri/menu_darwin.c @@ -587,11 +587,8 @@ id createAttributedString(const char* title, const char* fontName, int 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 { + font = msg(c("NSFont"), s("fontWithName:size:"), fontNameAsNSString, fontSizeFloat); + if( font == NULL ) { bool supportsMonospacedDigitSystemFont = (bool) msg(c("NSFont"), s("respondsToSelector:"), s("monospacedDigitSystemFontOfSize:weight:")); if( supportsMonospacedDigitSystemFont ) { 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 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")));