github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

App connection added

Browse Source
This commit is contained in:
Gabor
2016-12-22 15:00:22 +01:00
parent 5459fc3c36
commit 454b0e2a11
10 changed files with 620 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lv_misc/font.h
View File

@@ -88,11 +88,7 @@ static inline const uint8_t * font_get_bitmap(const font_t * font_p, uint8_t let
*/
static inline uint8_t font_get_height(const font_t * font_p)
{
#if LV_DOWNSCALE > 1 && LV_UPSCALE_FONT != 0
return font_p->height_row * LV_DOWNSCALE;
#else
return font_p->height_row;
#endif
}
/**
@@ -112,11 +108,7 @@ static inline uint8_t font_get_width(const font_t * font_p, uint8_t letter)
font_p->width_bit_a[letter];
}
#if LV_DOWNSCALE > 1 && LV_UPSCALE_FONT != 0
return w * LV_DOWNSCALE;
#else
return w;
#endif
}
#endif

8
lv_misc/text.c
View File

@@ -64,10 +64,10 @@ void txt_get_size(point_t * size_res, const char * text, const font_t * font,
size_res->y += letter_height + line_space;
}
/*Correction with the last line space*/
if(size_res->y >= 0) {
size_res->y -= line_space;
}
/*Correction with the last line space or set the height manually if the text is empty*/
if(size_res->y == 0) size_res->y = letter_height;
else size_res->y -= line_space;
}
/**