Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-06-01 00:51:49 +08:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

fix(calendar): allow setting years in ascending order (#8315)

Browse Source
This commit is contained in:
André Costa
2025-06-02 12:49:12 +02:00
committed by GitHub
parent 26587238ae
commit d290f4e8fe
2 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/calendar/lv_calendar_header_dropdown.c
+17 -18
View File
@@ -145,17 +145,20 @@ static void year_event_cb(lv_event_t * e)
uint32_t sel = lv_dropdown_get_selected(dropdown); uint32_t sel = lv_dropdown_get_selected(dropdown);
const char * year_p = lv_dropdown_get_options(dropdown);
LV_ASSERT(3 + sel * 5 < lv_strlen(year_p));
/* NOTE: Assumes YYYY format */
const uint32_t year = (year_p[0 + sel * 5] - '0') * 1000 +
(year_p[1 + sel * 5] - '0') * 100 +
(year_p[2 + sel * 5] - '0') * 10 +
(year_p[3 + sel * 5] - '0');
const lv_calendar_date_t * d; const lv_calendar_date_t * d;
d = lv_calendar_get_showed_date(calendar); d = lv_calendar_get_showed_date(calendar);
/* Get the first year on the options list
* NOTE: Assumes the first 4 digits in the option list are numbers */
const char * year_p = lv_dropdown_get_options(dropdown);
const uint32_t year = (year_p[0] - '0') * 1000 + (year_p[1] - '0') * 100 + (year_p[2] - '0') * 10 +
(year_p[3] - '0');
lv_calendar_date_t newd = *d; lv_calendar_date_t newd = *d;
newd.year = year - sel; newd.year = year;
lv_calendar_set_month_shown(calendar, newd.year, newd.month); lv_calendar_set_month_shown(calendar, newd.year, newd.month);
} }
@@ -165,18 +168,14 @@ static void value_changed_event_cb(lv_event_t * e)
lv_obj_t * header = lv_event_get_current_target(e); lv_obj_t * header = lv_event_get_current_target(e);
lv_obj_t * calendar = lv_obj_get_parent(header); lv_obj_t * calendar = lv_obj_get_parent(header);
const lv_calendar_date_t * cur_date = lv_calendar_get_showed_date(calendar); const lv_calendar_date_t * cur_date = lv_calendar_get_showed_date(calendar);
lv_obj_t * year_dd = lv_obj_get_child(header, 0); lv_obj_t * year_dd = lv_obj_get_child(header, 0);
/* Get the first year on the options list
* NOTE: Assumes the first 4 digits in the option list are numbers */
const char * year_p = lv_dropdown_get_options(year_dd);
const uint32_t year = (year_p[0] - '0') * 1000 + (year_p[1] - '0') * 100 + (year_p[2] - '0') * 10 +
(year_p[3] - '0');
lv_dropdown_set_selected(year_dd, year - cur_date->year);
lv_obj_t * month_dd = lv_obj_get_child(header, 1); lv_obj_t * month_dd = lv_obj_get_child(header, 1);
const char * year_p = lv_dropdown_get_options(year_dd);
/* NOTE: Assumes YYYY format */
const int32_t first_year = (year_p[0] - '0') * 1000 +
(year_p[1] - '0') * 100 +
(year_p[2] - '0') * 10 + (year_p[3] - '0');
lv_dropdown_set_selected(year_dd, LV_ABS(first_year - cur_date->year));
lv_dropdown_set_selected(month_dd, cur_date->month - 1); lv_dropdown_set_selected(month_dd, cur_date->month - 1);
} }
tests/src/test_cases/widgets/test_calendar.c
+21
View File
@@ -171,6 +171,27 @@ void test_calendar_header_dropdown_create_gui(void)
TEST_ASSERT_EQUAL_SCREENSHOT("widgets/calendar_05.png"); TEST_ASSERT_EQUAL_SCREENSHOT("widgets/calendar_05.png");
} }
void test_calendar_header_dropdown_ascending_year_order(void)
{
const char * years = "2020\n2021\n2022\n2023\n2024\n";
lv_calendar_header_dropdown_create(g_calendar);
lv_calendar_header_dropdown_set_year_list(g_calendar, years);
lv_calendar_set_month_shown(g_calendar, 2022, 9);
TEST_ASSERT_EQUAL_SCREENSHOT("widgets/calendar_05.png");
}
void test_calendar_header_dropdown_descending_year_order(void)
{
const char * years = "2024\n2023\n2022\n2021\n2020\n";
lv_calendar_header_dropdown_create(g_calendar);
lv_calendar_header_dropdown_set_year_list(g_calendar, years);
lv_calendar_set_month_shown(g_calendar, 2022, 9);
TEST_ASSERT_EQUAL_SCREENSHOT("widgets/calendar_05.png");
}
void test_calendar_header_arrow_create_gui(void) void test_calendar_header_arrow_create_gui(void)
{ {
lv_calendar_add_header_arrow(g_calendar); lv_calendar_add_header_arrow(g_calendar);