macOS default font

This commit is contained in:
Niklas Mischkulnig 2018-06-04 11:23:21 +02:00
parent 2ff751a836
commit a235a6b355
2 changed files with 10 additions and 3 deletions

View File

@ -213,7 +213,14 @@ void uiDrawTextLayoutExtents(uiDrawTextLayout *tl, double *width, double *height
[tl->forLines returnWidth:NULL height: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);
} }

2
ui.h
View File

@ -919,7 +919,7 @@ struct uiFontDescriptor {
uiTextStretch Stretch; uiTextStretch Stretch;
}; };
_UI_EXTERN uiDrawTextFont *uiDrawLoadDefaultFont(); _UI_EXTERN void uiDrawLoadDefaultFont(uiFontDescriptor *f);
// uiDrawTextLayout is a concrete representation of a // uiDrawTextLayout is a concrete representation of a
// uiAttributedString that can be displayed in a uiDrawContext. // uiAttributedString that can be displayed in a uiDrawContext.