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

Fixing word-wrap

ugfx_release_2.6
Joel Bodenmann 2015-11-02 09:26:32 +01:00
parent 69de17687c
commit 2dcd3509c9
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gdisp/gdisp.c
View File

@ -3174,8 +3174,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
mf_render_aligned(wrapParameters->font, wrapParameters->x, wrapParameters->y, wrapParameters->justify, line, count, fillcharglyph, wrapParameters->g);
wrapParameters->y += wrapParameters->font->baseline_y;
wrapParameters->y += wrapParameters->font->line_height;
return TRUE;
}
#endif

4
src/gdisp/mcufont/mf_wordwrap.c
View File

@ -172,8 +172,8 @@ static void tune_lines(struct linelen_s *current, struct linelen_s *previous,
void mf_wordwrap(const struct mf_font_s *font, int16_t width,
mf_str text, mf_line_callback_t callback, void *state)
{
struct linelen_s current;
struct linelen_s previous;
struct linelen_s current = { 0 };
struct linelen_s previous = { 0 };
bool full;
current.start = text;