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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2020-11-03 09:23:29 +01:00
parent f42afb1c52 5035c0c780
commit 112c894e73
4 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lv_conf_kconfig.h
View File

@@ -34,7 +34,7 @@ extern "C" {
/******************* /*******************
* THEME SELECTION * THEME SELECTION
*******************/ *******************/
#ifndef LV_THEME_DEFAULT_INIT #ifndef LV_THEME_DEFAULT_INIT
#if defined (CONFIG_LV_THEME_DEFAULT_INIT_EMPTY) #if defined (CONFIG_LV_THEME_DEFAULT_INIT_EMPTY)
#define CONFIG_LV_THEME_DEFAULT_INIT lv_theme_empty_init #define CONFIG_LV_THEME_DEFAULT_INIT lv_theme_empty_init
@@ -51,7 +51,7 @@ extern "C" {
* FONT SELECTION * FONT SELECTION
*******************/ *******************/
/* NOTE: In Kconfig instead of `LV_THEME_DEFAULT_FONT_SMALL` /* NOTE: In Kconfig instead of `LV_THEME_DEFAULT_FONT_SMALL`
* `CONFIG_LV_THEME_DEFAULT_FONT_SMALL_<font_name>` is defined * `CONFIG_LV_THEME_DEFAULT_FONT_SMALL_<font_name>` is defined
* hence the large selection with if-s * hence the large selection with if-s
*/ */

3
src/lv_widgets/lv_gauge.c
View File

@@ -590,7 +590,8 @@ static void lv_gauge_draw_needle(lv_obj_t * gauge, const lv_area_t * clip_area)
if(ext->needle_img == NULL) { if(ext->needle_img == NULL) {
lv_draw_line_dsc_init(&line_dsc); lv_draw_line_dsc_init(&line_dsc);
lv_obj_init_draw_line_dsc(gauge, LV_GAUGE_PART_NEEDLE, &line_dsc); lv_obj_init_draw_line_dsc(gauge, LV_GAUGE_PART_NEEDLE, &line_dsc);
} else { }
else {
lv_draw_img_dsc_init(&img_dsc); lv_draw_img_dsc_init(&img_dsc);
lv_obj_init_draw_img_dsc(gauge, LV_GAUGE_PART_NEEDLE, &img_dsc); lv_obj_init_draw_img_dsc(gauge, LV_GAUGE_PART_NEEDLE, &img_dsc);
} }

8
src/lv_widgets/lv_label.c
View File

@@ -266,12 +266,12 @@ void lv_label_set_text_fmt(lv_obj_t * label, const char * fmt, ...)
} }
if(ext->text != NULL && ext->static_txt == 0) { if(ext->text != NULL && ext->static_txt == 0) {
lv_mem_free(ext->text); lv_mem_free(ext->text);
ext->text = NULL; ext->text = NULL;
} }
va_list args; va_list args;
va_start (args, fmt); va_start(args, fmt);
ext->text = _lv_txt_set_text_vfmt(fmt, args); ext->text = _lv_txt_set_text_vfmt(fmt, args);
va_end(args); va_end(args);
ext->static_txt = 0; /*Now the text is dynamically allocated*/ ext->static_txt = 0; /*Now the text is dynamically allocated*/
@@ -1175,7 +1175,7 @@ void lv_label_refr_text(lv_obj_t * label)
p.y = lv_area_get_height(&txt_coords); p.y = lv_area_get_height(&txt_coords);
y_overed = p.y % y_overed = p.y %
(lv_font_get_line_height(font) + line_space); /*Round down to the last line*/ (lv_font_get_line_height(font) + line_space); /*Round down to the last line*/
if (y_overed >= lv_font_get_line_height(font)) { if(y_overed >= lv_font_get_line_height(font)) {
p.y -= y_overed; p.y -= y_overed;
p.y += lv_font_get_line_height(font); p.y += lv_font_get_line_height(font);
} }

38
src/lv_widgets/lv_msgbox.c
View File

@@ -205,29 +205,29 @@ void lv_msgbox_set_text(lv_obj_t * mbox, const char * txt)
*/ */
void lv_msgbox_set_text_fmt(lv_obj_t * mbox, const char * fmt, ...) void lv_msgbox_set_text_fmt(lv_obj_t * mbox, const char * fmt, ...)
{ {
LV_ASSERT_OBJ(mbox, LV_OBJX_NAME); LV_ASSERT_OBJ(mbox, LV_OBJX_NAME);
LV_ASSERT_STR(fmt); LV_ASSERT_STR(fmt);
lv_msgbox_ext_t * msgbox_ext = lv_obj_get_ext_attr(mbox); lv_msgbox_ext_t * msgbox_ext = lv_obj_get_ext_attr(mbox);
lv_label_ext_t * label_ext = lv_obj_get_ext_attr(msgbox_ext->text); lv_label_ext_t * label_ext = lv_obj_get_ext_attr(msgbox_ext->text);
/*If text is NULL then refresh */ /*If text is NULL then refresh */
if(fmt == NULL) { if(fmt == NULL) {
lv_label_refr_text(msgbox_ext->text); lv_label_refr_text(msgbox_ext->text);
return; return;
} }
if(label_ext->text != NULL) { if(label_ext->text != NULL) {
lv_mem_free(label_ext->text); lv_mem_free(label_ext->text);
label_ext->text = NULL; label_ext->text = NULL;
} }
va_list args; va_list args;
va_start (args, fmt); va_start(args, fmt);
label_ext->text = _lv_txt_set_text_vfmt(fmt, args); label_ext->text = _lv_txt_set_text_vfmt(fmt, args);
va_end(args); va_end(args);
lv_label_refr_text(msgbox_ext->text); lv_label_refr_text(msgbox_ext->text);
mbox_realign(mbox); mbox_realign(mbox);
} }
/** /**