Rename to uiLoadControlFont

This commit is contained in:
Niklas Mischkulnig 2018-08-09 13:46:04 +02:00
parent 0b14022655
commit 836fda6aaf
No known key found for this signature in database
GPG Key ID: 9AB442486F8CDE7B
5 changed files with 5 additions and 5 deletions

View File

@ -213,7 +213,7 @@ void uiDrawTextLayoutExtents(uiDrawTextLayout *tl, double *width, double *height
[tl->forLines returnWidth:NULL height:height]; [tl->forLines returnWidth:NULL height:height];
} }
void uiDrawLoadDefaultFont(uiFontDescriptor *f) void uiLoadControlFont(uiFontDescriptor *f)
{ {
CTFontRef ctfont; CTFontRef ctfont;
CTFontDescriptorRef ctdesc; CTFontDescriptorRef ctdesc;

View File

@ -102,7 +102,7 @@ static void handlerDraw(uiAreaHandler *a, uiArea *area, uiAreaDrawParams *p)
params.String = attrstr; params.String = attrstr;
if (useSystemFont) if (useSystemFont)
uiDrawLoadDefaultFont(&defaultFont); uiLoadControlFont(&defaultFont);
else else
uiFontButtonFont(fontButton, &defaultFont); uiFontButtonFont(fontButton, &defaultFont);
params.DefaultFont = &defaultFont; params.DefaultFont = &defaultFont;

2
ui.h
View File

@ -919,7 +919,7 @@ struct uiFontDescriptor {
uiTextStretch Stretch; uiTextStretch Stretch;
}; };
_UI_EXTERN void uiDrawLoadDefaultFont(uiFontDescriptor *f); _UI_EXTERN void uiLoadControlFont(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.

View File

@ -80,7 +80,7 @@ void uiDrawTextLayoutExtents(uiDrawTextLayout *tl, double *width, double *height
*height = pangoToCairo(logical.height); *height = pangoToCairo(logical.height);
} }
void uiDrawLoadDefaultFont(uiFontDescriptor *f) void uiLoadControlFont(uiFontDescriptor *f)
{ {
GtkWidget *widget; GtkWidget *widget;
GtkStyleContext *style; GtkStyleContext *style;

View File

@ -535,7 +535,7 @@ void uiDrawTextLayoutExtents(uiDrawTextLayout *tl, double *width, double *height
*height = metrics.height; *height = metrics.height;
} }
void uiDrawLoadDefaultFont(uiFontDescriptor *f) void uiLoadControlFont(uiFontDescriptor *f)
{ {
fontCollection *collection; fontCollection *collection;
IDWriteGdiInterop *gdi; IDWriteGdiInterop *gdi;