orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elementary: refactor day handling in calendar to just use unsigned char.

This commit is contained in:
Cedric BAIL 2017-06-05 13:42:08 -07:00
parent 31a1850265
commit f2043359b0
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/elementary/elm_calendar.c
View File

@ -388,13 +388,13 @@ _access_info_cb(void *data EINA_UNUSED, Evas_Object *obj)
static void static void
_access_calendar_item_register(Evas_Object *obj) _access_calendar_item_register(Evas_Object *obj)
{ {
int maxdays, day, i; unsigned int maxdays, i;
char day_s[3], pname[14]; char day_s[13], pname[14];
unsigned day = 0;
Evas_Object *ao; Evas_Object *ao;
ELM_CALENDAR_DATA_GET(obj, sd); ELM_CALENDAR_DATA_GET(obj, sd);
day = 0;
maxdays = _maxdays_get(&sd->shown_time, 0); maxdays = _maxdays_get(&sd->shown_time, 0);
for (i = 0; i < 42; i++) 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_callback_set(_elm_access_info_get(ao),
ELM_ACCESS_INFO, _access_info_cb, NULL); 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); elm_widget_access_info_set(ao, (const char*)day_s);
} }
else else

4
src/lib/elementary/elm_widget_calendar.h
View File

@ -38,7 +38,7 @@ struct _Elm_Calendar_Data
Eina_List *marks; Eina_List *marks;
double interval, first_interval; double interval, first_interval;
int spin_speed; 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; Ecore_Timer *spin_month, *spin_year, *update_timer;
Elm_Calendar_Format_Cb format_func; Elm_Calendar_Format_Cb format_func;
const char *weekdays[ELM_DAY_LAST]; const char *weekdays[ELM_DAY_LAST];
@ -55,6 +55,8 @@ struct _Elm_Calendar_Data
Elm_Calendar_Select_Mode select_mode; Elm_Calendar_Select_Mode select_mode;
Elm_Calendar_Selectable selectable; Elm_Calendar_Selectable selectable;
unsigned char first_day_it;
Eina_Bool selected : 1; Eina_Bool selected : 1;
Eina_Bool double_spinners : 1; Eina_Bool double_spinners : 1;
Eina_Bool filling : 1; Eina_Bool filling : 1;