From 6f357ea745669c0f3c758ec6306513e3531bfda7 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Sun, 28 Feb 2021 14:17:33 +0100 Subject: [PATCH] minor fixes --- lv_conf_template.h | 3 ++- src/extra/widgets/list/lv_list.c | 1 + src/lv_conf_internal.h | 9 ++++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lv_conf_template.h b/lv_conf_template.h index baf95060e..c6370c396 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -415,7 +415,8 @@ typedef void * lv_user_data_t; # endif # define LV_CALENDAR_DEFAULT_MONTH_NAMES {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"} -# define LV_USE_CALENDAR_HEADER_ARROW 1 +# define LV_USE_CALENDAR_HEADER_ARROW 1 +# define LV_USE_CALENDAR_HEADER_DROPDOWN 1 #endif /*LV_USE_CALENDAR*/ #define LV_USE_COLORWHEEL 1 diff --git a/src/extra/widgets/list/lv_list.c b/src/extra/widgets/list/lv_list.c index 81653057d..55635cb27 100644 --- a/src/extra/widgets/list/lv_list.c +++ b/src/extra/widgets/list/lv_list.c @@ -93,6 +93,7 @@ lv_obj_t * lv_list_add_btn(lv_obj_t * list, const char * icon, const char * txt, const char * lv_list_get_btn_text(lv_obj_t * list, lv_obj_t * btn) { + LV_UNUSED(list); uint32_t i; for(i = 0; i < lv_obj_get_child_cnt(btn); i++) { lv_obj_t * child = lv_obj_get_child(btn, i); diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index de014c91e..88f85dca4 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -1210,7 +1210,14 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */ # ifdef CONFIG_LV_USE_CALENDAR_HEADER_ARROW # define LV_USE_CALENDAR_HEADER_ARROW CONFIG_LV_USE_CALENDAR_HEADER_ARROW # else -# define LV_USE_CALENDAR_HEADER_ARROW 1 +# define LV_USE_CALENDAR_HEADER_ARROW 1 +# endif +#endif +#ifndef LV_USE_CALENDAR_HEADER_DROPDOWN +# ifdef CONFIG_LV_USE_CALENDAR_HEADER_DROPDOWN +# define LV_USE_CALENDAR_HEADER_DROPDOWN CONFIG_LV_USE_CALENDAR_HEADER_DROPDOWN +# else +# define LV_USE_CALENDAR_HEADER_DROPDOWN 1 # endif #endif #endif /*LV_USE_CALENDAR*/