From a235a6b355b4fcd5ee634b5d8e1245a5269592dc Mon Sep 17 00:00:00 2001
From: Niklas Mischkulnig <mischnic@users.noreply.github.com>
Date: Mon, 4 Jun 2018 11:23:21 +0200
Subject: [PATCH] macOS default font

---
 darwin/drawtext.m | 11 +++++++++--
 ui.h              |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/darwin/drawtext.m b/darwin/drawtext.m
index dbcbccd0..68079f00 100644
--- a/darwin/drawtext.m
+++ b/darwin/drawtext.m
@@ -213,7 +213,14 @@ void uiDrawTextLayoutExtents(uiDrawTextLayout *tl, double *width, double *height
 	[tl->forLines returnWidth:NULL height:height];
 }
 
-uiDrawTextFont *uiDrawLoadDefaultFont()
+void uiDrawLoadDefaultFont(uiFontDescriptor *f)
 {
-	return mkTextFontFromNSFont([NSFont systemFontOfSize:0]);
+	CTFontRef ctfont;
+	CTFontDescriptorRef ctdesc;
+
+	ctfont = (CTFontRef) [NSFont systemFontOfSize:0];
+	ctdesc = CTFontCopyFontDescriptor(ctfont);
+	uiprivFontDescriptorFromCTFontDescriptor(ctdesc, f);
+	CFRelease(ctdesc);
+	f->Size = CTFontGetSize(ctfont);
 }
diff --git a/ui.h b/ui.h
index 228230b1..362b337e 100644
--- a/ui.h
+++ b/ui.h
@@ -919,7 +919,7 @@ struct uiFontDescriptor {
 	uiTextStretch Stretch;
 };
 
-_UI_EXTERN uiDrawTextFont *uiDrawLoadDefaultFont();
+_UI_EXTERN void uiDrawLoadDefaultFont(uiFontDescriptor *f);
 
 // uiDrawTextLayout is a concrete representation of a
 // uiAttributedString that can be displayed in a uiDrawContext.