From: Cedric BAIL Date: Mon, 5 Jun 2017 20:42:08 +0000 (-0700) Subject: elementary: refactor day handling in calendar to just use unsigned char. X-Git-Tag: upstream/1.20.0~760 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f2043359b038a641145a7da1eb718a6375386610;p=platform%2Fupstream%2Fefl.git elementary: refactor day handling in calendar to just use unsigned char. --- diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c index 58570a1..3c906da 100644 --- a/src/lib/elementary/elm_calendar.c +++ b/src/lib/elementary/elm_calendar.c @@ -388,13 +388,13 @@ _access_info_cb(void *data EINA_UNUSED, Evas_Object *obj) static void _access_calendar_item_register(Evas_Object *obj) { - int maxdays, day, i; - char day_s[3], pname[14]; + unsigned int maxdays, i; + char day_s[13], pname[14]; + unsigned day = 0; Evas_Object *ao; ELM_CALENDAR_DATA_GET(obj, sd); - day = 0; maxdays = _maxdays_get(&sd->shown_time, 0); for (i = 0; i < 42; i++) { @@ -410,7 +410,7 @@ _access_calendar_item_register(Evas_Object *obj) _elm_access_callback_set(_elm_access_info_get(ao), ELM_ACCESS_INFO, _access_info_cb, NULL); - snprintf(day_s, sizeof(day_s), "%i", day++); + snprintf(day_s, sizeof(day_s), "%i", (int) (day++)); elm_widget_access_info_set(ao, (const char*)day_s); } else diff --git a/src/lib/elementary/elm_widget_calendar.h b/src/lib/elementary/elm_widget_calendar.h index b8f7bdf..a9ca2f4 100644 --- a/src/lib/elementary/elm_widget_calendar.h +++ b/src/lib/elementary/elm_widget_calendar.h @@ -38,7 +38,7 @@ struct _Elm_Calendar_Data Eina_List *marks; double interval, first_interval; int spin_speed; - int today_it, selected_it, first_day_it, focused_it; + int today_it, selected_it, focused_it; Ecore_Timer *spin_month, *spin_year, *update_timer; Elm_Calendar_Format_Cb format_func; const char *weekdays[ELM_DAY_LAST]; @@ -55,6 +55,8 @@ struct _Elm_Calendar_Data Elm_Calendar_Select_Mode select_mode; Elm_Calendar_Selectable selectable; + unsigned char first_day_it; + Eina_Bool selected : 1; Eina_Bool double_spinners : 1; Eina_Bool filling : 1;