diff options
| author | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-10-30 15:37:55 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-10-30 15:37:55 +0100 |
| commit | ee2b82271d7f85dc94c19aed46d42ac8187c79e6 (patch) | |
| tree | 8e12867ab632257087d528f4f20708b5aafde80d /src/gdisp/mcufont | |
| parent | 1c7948b9267ae684ef602cbca9d5675d0b0a6281 (diff) | |
| download | uGFX-ee2b82271d7f85dc94c19aed46d42ac8187c79e6.tar.gz uGFX-ee2b82271d7f85dc94c19aed46d42ac8187c79e6.tar.bz2 uGFX-ee2b82271d7f85dc94c19aed46d42ac8187c79e6.zip | |
Adding word-wrap support for gdispDrawStringBox() and gdispFillStringBox()
Thanks to Koryagin Dmitry for this contribution
Diffstat (limited to 'src/gdisp/mcufont')
| -rw-r--r-- | src/gdisp/mcufont/mf_config.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/gdisp/mcufont/mf_config.h b/src/gdisp/mcufont/mf_config.h index ac2262d4..5c6f4ea9 100644 --- a/src/gdisp/mcufont/mf_config.h +++ b/src/gdisp/mcufont/mf_config.h @@ -25,16 +25,21 @@ /* Mapping from uGFX settings to mcufont settings */ #if GDISP_NEED_UTF8 -#define MF_ENCODING MF_ENCODING_UTF8 + #define MF_ENCODING MF_ENCODING_UTF8 +#else + #define MF_ENCODING MF_ENCODING_ASCII +#endif + +#if GDISP_NEED_TEXT_WORDWRAP + #define MF_USE_ADVANCED_WORDWRAP 1 #else -#define MF_ENCODING MF_ENCODING_ASCII + #define MF_USE_ADVANCED_WORDWRAP 0 #endif #define MF_USE_KERNING GDISP_NEED_TEXT_KERNING #define MF_FONT_FILE_NAME "src/gdisp/fonts/fonts.h" /* These are not used for now */ -#define MF_USE_ADVANCED_WORDWRAP 0 #define MF_USE_JUSTIFY 0 /******************************************************* |