Menu work
This commit is contained in:
@@ -71,7 +71,7 @@ const void * lv_font_get_bitmap_fmt_txt(lv_font_fmt_txt_glyph_dsc_t * g_dsc, lv_
|
||||
* @note If the character is not found in the font's character map, the function returns
|
||||
* 0 without drawing anything.
|
||||
*/
|
||||
uint16_t draw_character(pixel_t *framebuffer, const lv_font_t *font, const uint16_t x_loc, const uint16_t y_loc, const uint8_t character, pixel_t color)
|
||||
uint16_t draw_character(pixel_t *framebuffer, const lv_font_t *font, const uint16_t x_loc, const uint16_t y_loc, const char character, pixel_t color)
|
||||
{
|
||||
const lv_font_fmt_txt_dsc_t *font_dsc = (lv_font_fmt_txt_dsc_t *)font->dsc;
|
||||
lv_font_fmt_txt_glyph_dsc_t glyph_dsc;
|
||||
@@ -140,11 +140,11 @@ uint16_t draw_character(pixel_t *framebuffer, const lv_font_t *font, const uint1
|
||||
* @note All characters in the string are drawn on the same horizontal baseline (y_loc
|
||||
* remains constant for all characters).
|
||||
*/
|
||||
void draw_string(pixel_t *framebuffer, const lv_font_t *font, const uint16_t x_loc, const uint16_t y_loc, const uint8_t *string, pixel_t color)
|
||||
void draw_string(pixel_t *framebuffer, const lv_font_t *font, const uint16_t x_loc, const uint16_t y_loc, const char *string, pixel_t color)
|
||||
{
|
||||
uint32_t current_x = x_loc << 4;
|
||||
|
||||
for (const uint8_t *char_ptr = string; *char_ptr != '\0'; char_ptr++)
|
||||
for (const char *char_ptr = string; *char_ptr != '\0'; char_ptr++)
|
||||
{
|
||||
uint16_t advance_width = draw_character(framebuffer, font, current_x >> 4, y_loc, *char_ptr, color);
|
||||
current_x += advance_width;
|
||||
|
||||
Reference in New Issue
Block a user