Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

lv_draw_label bugfix (old rounding from LV_FONT_ANTIALIAS)

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2018-02-23 15:19:39 +01:00
parent a11957d0b4
commit c4503cb8f8
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lv_draw/lv_draw.c
View File

@ -362,10 +362,6 @@ void lv_draw_label(const lv_area_t * coords,const lv_area_t * mask, const lv_sty
letter_w = lv_font_get_width(font, letter); letter_w = lv_font_get_width(font, letter);
pos.x += letter_w + style->text.letter_space; pos.x += letter_w + style->text.letter_space;
/* Round error occurs in x position
* When odd widths are scaled down the last 1 is lost. So the letters seems shorter.
* Now calculate according to it to be consequent */
if(letter_w & 0x01) pos.x--;
} }
/*Go to next line*/ /*Go to next line*/
line_start = line_end; line_start = line_end;

37
lv_misc/lv_font.h
View File

@ -139,77 +139,78 @@ const int16_t lv_font_get_width_sparse(const lv_font_t * font, uint32_t unicode_
/********************** /**********************
* MACROS * MACROS
**********************/ **********************/
#define LV_FONT_DECLARE(font_name) extern lv_font_t font_name;
/*********************** /******************************
* FONT DECLARATION INCLUDES * FONT DECLARATION INCLUDES
***********************/ *****************************/
/*10 px */ /*10 px */
#if USE_LV_FONT_DEJAVU_10 #if USE_LV_FONT_DEJAVU_10
extern lv_font_t lv_font_dejavu_10; LV_FONT_DECLARE(lv_font_dejavu_10);
#endif #endif
#if USE_LV_FONT_DEJAVU_10_LATIN_SUP #if USE_LV_FONT_DEJAVU_10_LATIN_SUP
extern lv_font_t lv_font_dejavu_10_latin_sup; LV_FONT_DECLARE(lv_font_dejavu_10_latin_sup);
#endif #endif
#if USE_LV_FONT_DEJAVU_10_CYRILLIC #if USE_LV_FONT_DEJAVU_10_CYRILLIC
extern lv_font_t lv_font_dejavu_10_cyrillic; LV_FONT_DECLARE(lv_font_dejavu_10_cyrillic);
#endif #endif
#if USE_LV_FONT_SYMBOL_10 #if USE_LV_FONT_SYMBOL_10
extern lv_font_t lv_font_symbol_10; LV_FONT_DECLARE(lv_font_symbol_10);
#endif #endif
/*20 px */ /*20 px */
#if USE_LV_FONT_DEJAVU_20 #if USE_LV_FONT_DEJAVU_20
extern lv_font_t lv_font_dejavu_20; LV_FONT_DECLARE(lv_font_dejavu_20);
#endif #endif
#if USE_LV_FONT_DEJAVU_20_LATIN_SUP #if USE_LV_FONT_DEJAVU_20_LATIN_SUP
extern lv_font_t lv_font_dejavu_20_latin_sup; LV_FONT_DECLARE(lv_font_dejavu_20_latin_sup);
#endif #endif
#if USE_LV_FONT_DEJAVU_20_CYRILLIC #if USE_LV_FONT_DEJAVU_20_CYRILLIC
extern lv_font_t lv_font_dejavu_20_cyrillic; LV_FONT_DECLARE(lv_font_dejavu_20_cyrillic);
#endif #endif
#if USE_LV_FONT_SYMBOL_20 #if USE_LV_FONT_SYMBOL_20
extern lv_font_t lv_font_symbol_20; LV_FONT_DECLARE(lv_font_symbol_20);
#endif #endif
/*30 px */ /*30 px */
#if USE_LV_FONT_DEJAVU_30 #if USE_LV_FONT_DEJAVU_30
extern lv_font_t lv_font_dejavu_30; LV_FONT_DECLARE(lv_font_dejavu_30);
#endif #endif
#if USE_LV_FONT_DEJAVU_30_LATIN_SUP #if USE_LV_FONT_DEJAVU_30_LATIN_SUP
extern lv_font_t lv_font_dejavu_30_latin_sup; LV_FONT_DECLARE(lv_font_dejavu_30_latin_sup);
#endif #endif
#if USE_LV_FONT_DEJAVU_30_CYRILLIC #if USE_LV_FONT_DEJAVU_30_CYRILLIC
extern lv_font_t lv_font_dejavu_30_cyrillic; LV_FONT_DECLARE(lv_font_dejavu_30_cyrillic);
#endif #endif
#if USE_LV_FONT_SYMBOL_30 #if USE_LV_FONT_SYMBOL_30
extern lv_font_t lv_font_symbol_30; LV_FONT_DECLARE(lv_font_symbol_30);
#endif #endif
/*40 px */ /*40 px */
#if USE_LV_FONT_DEJAVU_40 #if USE_LV_FONT_DEJAVU_40
extern lv_font_t lv_font_dejavu_40; LV_FONT_DECLARE(lv_font_dejavu_40);
#endif #endif
#if USE_LV_FONT_DEJAVU_40_LATIN_SUP #if USE_LV_FONT_DEJAVU_40_LATIN_SUP
extern lv_font_t lv_font_dejavu_40_latin_sup; LV_FONT_DECLARE(lv_font_dejavu_40_latin_sup);
#endif #endif
#if USE_LV_FONT_DEJAVU_40_CYRILLIC #if USE_LV_FONT_DEJAVU_40_CYRILLIC
extern lv_font_t lv_font_dejavu_40_cyrillic; LV_FONT_DECLARE(lv_font_dejavu_40_cyrillic);
#endif #endif
#if USE_LV_FONT_SYMBOL_40 #if USE_LV_FONT_SYMBOL_40
extern lv_font_t lv_font_symbol_40; LV_FONT_DECLARE(lv_font_symbol_40);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus