uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Handle antialiased font drawing when using word-wrap

Browse source
This commit is contained in:
inmarket 2015-11-04 15:05:16 +10:00
parent d4f43afcd2
commit 1ed7559ef0
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gdisp/gdisp.c
View file

@ -3169,7 +3169,15 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/* Callback to render string boxes with word wrap. */ /* Callback to render string boxes with word wrap. */
#if GDISP_NEED_TEXT_WORDWRAP #if GDISP_NEED_TEXT_WORDWRAP
static bool mf_line_callback(mf_str line, uint16_t count, void *state) { static bool mf_drawline_callback(mf_str line, uint16_t count, void *state) {
wrapParameters_t* wrapParameters = (wrapParameters_t*)state;
mf_render_aligned(wrapParameters->font, wrapParameters->x, wrapParameters->y, wrapParameters->justify, line, count, drawcharglyph, wrapParameters->g);
wrapParameters->y += wrapParameters->font->line_height;
return TRUE;
}
static bool mf_fillline_callback(mf_str line, uint16_t count, void *state) {
wrapParameters_t* wrapParameters = (wrapParameters_t*)state; wrapParameters_t* wrapParameters = (wrapParameters_t*)state;
mf_render_aligned(wrapParameters->font, wrapParameters->x, wrapParameters->y, wrapParameters->justify, line, count, fillcharglyph, wrapParameters->g); mf_render_aligned(wrapParameters->font, wrapParameters->x, wrapParameters->y, wrapParameters->justify, line, count, fillcharglyph, wrapParameters->g);
@ -3283,7 +3291,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
wrapParameters.justify = justify; wrapParameters.justify = justify;
wrapParameters.g = g; wrapParameters.g = g;
mf_wordwrap(font, cx, str, mf_line_callback, &wrapParameters); mf_wordwrap(font, cx, str, mf_drawline_callback, &wrapParameters);
#else #else
mf_render_aligned(font, x, y, justify, str, 0, drawcharglyph, g); mf_render_aligned(font, x, y, justify, str, 0, drawcharglyph, g);
#endif #endif
@ -3336,7 +3344,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
wrapParameters.justify = justify; wrapParameters.justify = justify;
wrapParameters.g = g; wrapParameters.g = g;
mf_wordwrap(font, cx, str, mf_line_callback, &wrapParameters); mf_wordwrap(font, cx, str, mf_fillline_callback, &wrapParameters);
#else #else
mf_render_aligned(font, x, y, justify, str, 0, fillcharglyph, g); mf_render_aligned(font, x, y, justify, str, 0, fillcharglyph, g);
#endif #endif