From 38180ee3068a5c688fdff4cac6fdc688b43f79c8 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Mon, 29 Jan 2024 10:36:02 +0100 Subject: [PATCH] Update to latest lvgl, fix warning --- unl0kr/lvgl | 2 +- unl0kr/main.c | 1 + unl0kr/theme.c | 15 +++++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/unl0kr/lvgl b/unl0kr/lvgl index cd930f7..da3ff11 160000 --- a/unl0kr/lvgl +++ b/unl0kr/lvgl @@ -1 +1 @@ -Subproject commit cd930f7c8a9b802f00788928e7716d31f9c7a4b8 +Subproject commit da3ff11bd5e56a46e67aa15cae004b9877a8f377 diff --git a/unl0kr/main.c b/unl0kr/main.c index bd28b3d..038b7ee 100644 --- a/unl0kr/main.c +++ b/unl0kr/main.c @@ -209,6 +209,7 @@ static void sigaction_handler(int signum); static void *tick_thread (void *args) { + LV_UNUSED(args); while (1) { usleep(5 * 1000); /* Sleep for 5 millisecond */ lv_tick_inc(5); /* Tell LVGL that 5 milliseconds have elapsed */ diff --git a/unl0kr/theme.c b/unl0kr/theme.c index 22c1230..c12ffe3 100644 --- a/unl0kr/theme.c +++ b/unl0kr/theme.c @@ -344,16 +344,19 @@ static void keyboard_draw_task_added_cb(lv_event_t *event) { bool pressed = lv_btnmatrix_get_selected_btn(obj) == dsc->id1 && lv_obj_has_state(obj, LV_STATE_PRESSED); - if (draw_task->type == LV_DRAW_TASK_TYPE_LABEL) { - ((lv_draw_label_dsc_t *)dsc)->color = lv_color_hex((pressed ? key->pressed : key->normal).fg_color); + lv_draw_label_dsc_t *label_dsc = lv_draw_task_get_label_dsc(draw_task); + if (label_dsc) { + label_dsc->color = lv_color_hex((pressed ? key->pressed : key->normal).fg_color); } - if (draw_task->type == LV_DRAW_TASK_TYPE_FILL) { - ((lv_draw_fill_dsc_t *)dsc)->color = lv_color_hex((pressed ? key->pressed : key->normal).bg_color); + lv_draw_fill_dsc_t *fill_dsc = lv_draw_task_get_fill_dsc(draw_task); + if (fill_dsc) { + fill_dsc->color = lv_color_hex((pressed ? key->pressed : key->normal).bg_color); } - if (draw_task->type == LV_DRAW_TASK_TYPE_BORDER) { - ((lv_draw_border_dsc_t *)dsc)->color = lv_color_hex((pressed ? key->pressed : key->normal).border_color); + lv_draw_border_dsc_t *border_dsc = lv_draw_task_get_border_dsc(draw_task); + if (border_dsc) { + border_dsc->color = lv_color_hex((pressed ? key->pressed : key->normal).border_color); } }