Fixed extra dots when drawing anti-aliased fonts with wordwrap

This commit is contained in:
inmarket 2017-01-20 08:04:03 +10:00
parent 9360b27250
commit b90055d2f9
2 changed files with 2 additions and 1 deletions

View File

@ -14,6 +14,7 @@ FEATURE: Added GDISP_IMAGE_PNG_BLIT_BUFFER_SIZE configuration option
FEATURE: Added GDISP_IMAGE_PNG_FILE_BUFFER_SIZE configuration option FEATURE: Added GDISP_IMAGE_PNG_FILE_BUFFER_SIZE configuration option
FEATURE: Added GDISP_IMAGE_PNG_Z_BUFFER_SIZE configuration option FEATURE: Added GDISP_IMAGE_PNG_Z_BUFFER_SIZE configuration option
FEATURE: Added GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE configuration option FEATURE: Added GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE configuration option
FIX: Fixed extra dots when drawing anti-aliased fonts with wordwrap
*** Release 2.7 *** *** Release 2.7 ***

View File

@ -3486,7 +3486,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
mf_wordwrap(font, cx, str, mf_countline_callback, &nbrLines); mf_wordwrap(font, cx, str, mf_countline_callback, &nbrLines);
wrapParameters.y += (cy+1 - nbrLines*font->height)/2; wrapParameters.y += (cy+1 - nbrLines*font->height)/2;
mf_wordwrap(font, cx, str, mf_fillline_callback, &wrapParameters); mf_wordwrap(font, cx, str, mf_drawline_callback, &wrapParameters);
#else #else
y += (cy+1 - font->height)/2; y += (cy+1 - font->height)/2;
mf_render_aligned(font, x, y, justify, str, 0, drawcharglyph, g); mf_render_aligned(font, x, y, justify, str, 0, drawcharglyph, g);