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

change data inheritance model (drop ext)

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2021-01-08 21:30:14 +01:00
parent 6db5fa38ea
commit 04aa8de0f3
43 changed files with 1319 additions and 2736 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/lv_widgets/lv_canvas.c
View File

@@ -766,11 +766,11 @@ void lv_canvas_draw_rect(lv_obj_t * canvas, lv_coord_t x, lv_coord_t y, lv_coord
* @param max_w max width of the text. The text will be wrapped to fit into this size
* @param label_draw_dsc pointer to a valid label descriptor `lv_draw_label_dsc_t`
* @param txt text to display
* @param align align of the text (`LV_LABEL_ALIGN_LEFT/RIGHT/CENTER`)
* @param align align of the text (`LV_TEXT_ALIGN_LEFT/RIGHT/CENTER`)
*/
void lv_canvas_draw_text(lv_obj_t * canvas, lv_coord_t x, lv_coord_t y, lv_coord_t max_w,
lv_draw_label_dsc_t * label_draw_dsc,
const char * txt, lv_label_align_t align)
const char * txt, lv_text_align_t align)
{
LV_ASSERT_OBJ(canvas, LV_OBJX_NAME);
@@ -815,17 +815,17 @@ void lv_canvas_draw_text(lv_obj_t * canvas, lv_coord_t x, lv_coord_t y, lv_coord
lv_txt_flag_t flag;
switch(align) {
case LV_LABEL_ALIGN_LEFT:
flag = LV_TXT_FLAG_NONE;
case LV_TEXT_ALIGN_LEFT:
flag = LV_TEXT_FLAG_NONE;
break;
case LV_LABEL_ALIGN_RIGHT:
flag = LV_TXT_FLAG_RIGHT;
case LV_TEXT_ALIGN_RIGHT:
flag = LV_TEXT_FLAG_RIGHT;
break;
case LV_LABEL_ALIGN_CENTER:
flag = LV_TXT_FLAG_CENTER;
case LV_TEXT_ALIGN_CENTER:
flag = LV_TEXT_FLAG_CENTER;
break;
default:
flag = LV_TXT_FLAG_NONE;
flag = LV_TEXT_FLAG_NONE;
break;
}