diff --git a/darwin/drawtext.m b/darwin/drawtext.m index 4cd110d4..64c4b255 100644 --- a/darwin/drawtext.m +++ b/darwin/drawtext.m @@ -213,7 +213,7 @@ void uiDrawTextLayoutExtents(uiDrawTextLayout *tl, double *width, double *height [tl->forLines returnWidth:NULL height:height]; } -void uiDrawLoadDefaultFont(uiFontDescriptor *f) +void uiLoadControlFont(uiFontDescriptor *f) { CTFontRef ctfont; CTFontDescriptorRef ctdesc; diff --git a/examples/drawtext/main.c b/examples/drawtext/main.c index 67e15851..5f1a3712 100644 --- a/examples/drawtext/main.c +++ b/examples/drawtext/main.c @@ -102,7 +102,7 @@ static void handlerDraw(uiAreaHandler *a, uiArea *area, uiAreaDrawParams *p) params.String = attrstr; if (useSystemFont) - uiDrawLoadDefaultFont(&defaultFont); + uiLoadControlFont(&defaultFont); else uiFontButtonFont(fontButton, &defaultFont); params.DefaultFont = &defaultFont; diff --git a/ui.h b/ui.h index 362b337e..81ad402d 100644 --- a/ui.h +++ b/ui.h @@ -919,7 +919,7 @@ struct uiFontDescriptor { uiTextStretch Stretch; }; -_UI_EXTERN void uiDrawLoadDefaultFont(uiFontDescriptor *f); +_UI_EXTERN void uiLoadControlFont(uiFontDescriptor *f); // uiDrawTextLayout is a concrete representation of a // uiAttributedString that can be displayed in a uiDrawContext. diff --git a/unix/drawtext.c b/unix/drawtext.c index d451090a..f6f79ec5 100644 --- a/unix/drawtext.c +++ b/unix/drawtext.c @@ -80,7 +80,7 @@ void uiDrawTextLayoutExtents(uiDrawTextLayout *tl, double *width, double *height *height = pangoToCairo(logical.height); } -void uiDrawLoadDefaultFont(uiFontDescriptor *f) +void uiLoadControlFont(uiFontDescriptor *f) { GtkWidget *widget; GtkStyleContext *style; diff --git a/windows/drawtext.cpp b/windows/drawtext.cpp index a98534ee..2bab793d 100644 --- a/windows/drawtext.cpp +++ b/windows/drawtext.cpp @@ -535,7 +535,7 @@ void uiDrawTextLayoutExtents(uiDrawTextLayout *tl, double *width, double *height *height = metrics.height; } -void uiDrawLoadDefaultFont(uiFontDescriptor *f) +void uiLoadControlFont(uiFontDescriptor *f) { fontCollection *collection; IDWriteGdiInterop *gdi;