From 9b78a156de79beb89dd86b484c326c68682dc79f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= <mxn@1ec5.org>
Date: Wed, 18 Mar 2020 16:00:06 -0700
Subject: [ios, macos] Take font family names from user defaults

Take font family names from user defaults before falling back to font family names in Info.plist.
---
 platform/darwin/src/local_glyph_rasterizer.mm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/platform/darwin/src/local_glyph_rasterizer.mm b/platform/darwin/src/local_glyph_rasterizer.mm
index 78f7d74428..bbbb482969 100644
--- a/platform/darwin/src/local_glyph_rasterizer.mm
+++ b/platform/darwin/src/local_glyph_rasterizer.mm
@@ -65,12 +65,15 @@ public:
     }
 
     CTFontRef getFont() {
-        if (!fontFamily) {
-            return NULL;
-        }
-        
         if (!fontHandle) {
-            NSArray<NSString *> *fontFamilyNames = [@(fontFamily->c_str()) componentsSeparatedByString:@"\n"];
+            NSArray<NSString *> *fontFamilyNames = [[NSUserDefaults standardUserDefaults] stringArrayForKey:@"MGLIdeographicFontFamilyName"] ?: @[];
+            if (fontFamily) {
+                fontFamilyNames = [fontFamilyNames arrayByAddingObjectsFromArray:[@(fontFamily->c_str()) componentsSeparatedByString:@"\n"]];
+            }
+            if (!fontFamilyNames.count) {
+                return NULL;
+            }
+            
             CFMutableArrayRefHandle fontDescriptors(CFArrayCreateMutable(kCFAllocatorDefault, fontFamilyNames.count, &kCFTypeArrayCallBacks));
             for (NSString *name in fontFamilyNames) {
                 NSDictionary *fontAttributes = @{
-- 
cgit v1.2.1