diff options
| author | inmarket <andrewh@inmarket.com.au> | 2018-07-08 12:50:05 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2018-07-08 12:50:05 +1000 |
| commit | a24fab0d7217aaae1463f62d5d1381ef820cfa17 (patch) | |
| tree | 73f3bb1b93d13d9ee4161e0a994e5b53f70af93b /src/gdisp/gdisp.c | |
| parent | 2e8eaa34717f99c9696867b62ff5f19e76a7ccf8 (diff) | |
| download | uGFX-a24fab0d7217aaae1463f62d5d1381ef820cfa17.tar.gz uGFX-a24fab0d7217aaae1463f62d5d1381ef820cfa17.tar.bz2 uGFX-a24fab0d7217aaae1463f62d5d1381ef820cfa17.zip | |
Added type gFontmetric to replace V2.x fontmetric_t, and values gFontXXX replace fontXXX
Diffstat (limited to 'src/gdisp/gdisp.c')
| -rw-r--r-- | src/gdisp/gdisp.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gdisp/gdisp.c b/src/gdisp/gdisp.c index 1dbd26b2..323699d2 100644 --- a/src/gdisp/gdisp.c +++ b/src/gdisp/gdisp.c @@ -3608,19 +3608,19 @@ void gdispGDrawBox(GDisplay *g, gCoord x, gCoord y, gCoord cx, gCoord cy, gColor MUTEX_EXIT(g); } - gCoord gdispGetFontMetric(font_t font, fontmetric_t metric) { + gCoord gdispGetFontMetric(font_t font, gFontmetric metric) { if (!font) return 0; /* No mutex required as we only read static data */ switch(metric) { - case fontHeight: return font->height; - case fontDescendersHeight: return font->height - font->baseline_y; - case fontLineSpacing: return font->line_height; - case fontCharPadding: return 0; - case fontMinWidth: return font->min_x_advance; - case fontMaxWidth: return font->max_x_advance; - case fontBaselineX: return font->baseline_x; - case fontBaselineY: return font->baseline_y; + case gFontHeight: return font->height; + case gFontDescendersHeight: return font->height - font->baseline_y; + case gFontLineSpacing: return font->line_height; + case gFontCharPadding: return 0; + case gFontMinWidth: return font->min_x_advance; + case gFontMaxWidth: return font->max_x_advance; + case gFontBaselineX: return font->baseline_x; + case gFontBaselineY: return font->baseline_y; } return 0; } |