diff options
| author | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-11-02 09:26:32 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-11-02 09:26:32 +0100 |
| commit | 2dcd3509c9313e9de6022dc8a6ba5b91556a1bfa (patch) | |
| tree | 2f959b95841cbf07f6694ba2fa08778692e92fa1 /src/gdisp | |
| parent | 69de17687c304e4699804e6644dd156099de84c6 (diff) | |
| download | uGFX-2dcd3509c9313e9de6022dc8a6ba5b91556a1bfa.tar.gz uGFX-2dcd3509c9313e9de6022dc8a6ba5b91556a1bfa.tar.bz2 uGFX-2dcd3509c9313e9de6022dc8a6ba5b91556a1bfa.zip | |
Fixing word-wrap
Diffstat (limited to 'src/gdisp')
| -rw-r--r-- | src/gdisp/gdisp.c | 3 | ||||
| -rw-r--r-- | src/gdisp/mcufont/mf_wordwrap.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/gdisp/gdisp.c b/src/gdisp/gdisp.c index f2fd2738..16d605cb 100644 --- a/src/gdisp/gdisp.c +++ b/src/gdisp/gdisp.c @@ -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 diff --git a/src/gdisp/mcufont/mf_wordwrap.c b/src/gdisp/mcufont/mf_wordwrap.c index 4e2b1d4f..4c563c3f 100644 --- a/src/gdisp/mcufont/mf_wordwrap.c +++ b/src/gdisp/mcufont/mf_wordwrap.c @@ -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; |