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

gengrid, list: Use newly introduced macros internally. 

ELM_GENGRID_DATA_GET_FROM_ITEM and ELM_LIST_DATA_GET_FROM_ITEM.
This commit is contained in:
Daniel Juyung Seo 2014-08-22 03:09:10 +09:00
parent 408e334bf6
commit 4b4ed72181
2 changed files with 30 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
legacy/elementary/src/lib/elm_gengrid.c
View File

@ -191,7 +191,7 @@ _item_show_region(void *data)
+ minx; + minx;
else it_xpos = minx; else it_xpos = minx;
miny = miny + ((cvh - (sd->item_height * row)) miny = miny + ((cvh - (sd->item_height * row))
* GG_IT(it)->wsd->align_y); * sd->align_y);
it_ypos = y * sd->item_height + miny; it_ypos = y * sd->item_height + miny;
it->x = x; it->x = x;
it->y = y; it->y = y;
@ -209,7 +209,7 @@ _item_show_region(void *data)
+ miny; + miny;
else it_ypos = miny; else it_ypos = miny;
minx = minx + ((cvw - (sd->item_width * col)) minx = minx + ((cvw - (sd->item_width * col))
* GG_IT(it)->wsd->align_x); * sd->align_x);
it->x = x; it->x = x;
it->y = y; it->y = y;
} }
@ -389,7 +389,7 @@ _item_mouse_move_cb(void *data,
Evas_Event_Mouse_Move *ev = event_info; Evas_Event_Mouse_Move *ev = event_info;
Evas_Coord ox, oy, ow, oh, it_scrl_x, it_scrl_y; Evas_Coord ox, oy, ow, oh, it_scrl_x, it_scrl_y;
Evas_Coord minw = 0, minh = 0, x, y, dx, dy, adx, ady; Evas_Coord minw = 0, minh = 0, x, y, dx, dy, adx, ady;
Elm_Gengrid_Data *sd = GG_IT(it)->wsd; ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
{ {
@ -469,7 +469,7 @@ _item_mouse_move_cb(void *data,
it->dragging = 1; it->dragging = 1;
ELM_SAFE_FREE(it->long_timer, ecore_timer_del); ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
if (!GG_IT(it)->wsd->was_selected) if (!sd->was_selected)
it->unsel_cb(it); it->unsel_cb(it);
if (dy < 0) if (dy < 0)
@ -504,7 +504,7 @@ static Eina_Bool
_long_press_cb(void *data) _long_press_cb(void *data)
{ {
Elm_Gen_Item *it = data; Elm_Gen_Item *it = data;
Elm_Gengrid_Data *sd = GG_IT(it)->wsd; ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
it->long_timer = NULL; it->long_timer = NULL;
if (elm_widget_item_disabled_get(it) || (it->dragging)) if (elm_widget_item_disabled_get(it) || (it->dragging))
@ -518,8 +518,8 @@ _long_press_cb(void *data)
evas_object_raise(VIEW(it)); evas_object_raise(VIEW(it));
eo_do(WIDGET(it), elm_interface_scrollable_hold_set(EINA_TRUE)); eo_do(WIDGET(it), elm_interface_scrollable_hold_set(EINA_TRUE));
eo_do(WIDGET(it), elm_interface_scrollable_bounce_allow_get( eo_do(WIDGET(it), elm_interface_scrollable_bounce_allow_get(
&(GG_IT(it)->wsd->old_h_bounce), &(sd->old_h_bounce),
&(GG_IT(it)->wsd->old_v_bounce))); &(sd->old_v_bounce)));
eo_do(WIDGET(it), elm_interface_scrollable_bounce_allow_set(EINA_FALSE, EINA_FALSE)); eo_do(WIDGET(it), elm_interface_scrollable_bounce_allow_set(EINA_FALSE, EINA_FALSE));
edje_object_signal_emit(VIEW(it), "elm,state,reorder,enabled", "elm"); edje_object_signal_emit(VIEW(it), "elm,state,reorder,enabled", "elm");
@ -532,7 +532,7 @@ static void
_item_highlight(Elm_Gen_Item *it) _item_highlight(Elm_Gen_Item *it)
{ {
const char *selectraise = NULL; const char *selectraise = NULL;
Elm_Gengrid_Data *sd = GG_IT(it)->wsd; ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
if (_is_no_select(it) || if (_is_no_select(it) ||
(!sd->highlight) || (it->highlighted) || (!sd->highlight) || (it->highlighted) ||
@ -558,7 +558,7 @@ _item_mouse_down_cb(void *data,
Evas_Event_Mouse_Down *ev = event_info; Evas_Event_Mouse_Down *ev = event_info;
Elm_Gen_Item *it = data; Elm_Gen_Item *it = data;
Evas_Coord x, y; Evas_Coord x, y;
Elm_Gengrid_Data *sd = GG_IT(it)->wsd; ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
if (ev->button != 1) return; if (ev->button != 1) return;
@ -632,13 +632,11 @@ _item_mouse_up_cb(void *data,
{ {
Evas_Event_Mouse_Up *ev = event_info; Evas_Event_Mouse_Up *ev = event_info;
Eina_Bool dragged = EINA_FALSE; Eina_Bool dragged = EINA_FALSE;
Elm_Gengrid_Data *sd;
Elm_Gen_Item *it = data; Elm_Gen_Item *it = data;
ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
if (ev->button != 1) return; if (ev->button != 1) return;
sd = GG_IT(it)->wsd;
it->down = EINA_FALSE; it->down = EINA_FALSE;
sd->mouse_down = EINA_FALSE; sd->mouse_down = EINA_FALSE;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
@ -672,8 +670,7 @@ _item_mouse_up_cb(void *data,
eo_do(WIDGET(it), elm_interface_scrollable_hold_set(EINA_FALSE)); eo_do(WIDGET(it), elm_interface_scrollable_hold_set(EINA_FALSE));
eo_do(WIDGET(it), elm_interface_scrollable_bounce_allow_set( eo_do(WIDGET(it), elm_interface_scrollable_bounce_allow_set(
GG_IT(it)->wsd->old_h_bounce, sd->old_h_bounce, sd->old_v_bounce));
GG_IT(it)->wsd->old_v_bounce));
edje_object_signal_emit(VIEW(it), "elm,state,reorder,disabled", "elm"); edje_object_signal_emit(VIEW(it), "elm,state,reorder,disabled", "elm");
} }
@ -816,7 +813,7 @@ _item_realize(Elm_Gen_Item *it)
{ {
char buf[1024]; char buf[1024];
char style[1024]; char style[1024];
Elm_Gengrid_Data *sd = GG_IT(it)->wsd; ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
if ((it->realized) || if ((it->realized) ||
(it->generation < sd->generation)) (it->generation < sd->generation))
@ -980,7 +977,7 @@ _reorder_item_move_animator_cb(void *data)
Elm_Gen_Item *it = data; Elm_Gen_Item *it = data;
Evas_Coord dx, dy; Evas_Coord dx, dy;
double tt, t; double tt, t;
Elm_Gengrid_Data *sd = GG_IT(it)->wsd; ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
tt = REORDER_EFFECT_TIME; tt = REORDER_EFFECT_TIME;
t = ((0.0 > (t = ecore_loop_time_get() - t = ((0.0 > (t = ecore_loop_time_get() -
@ -1053,14 +1050,13 @@ _item_place(Elm_Gen_Item *it,
Evas_Coord x, y, ox, oy, cvx, cvy, cvw, cvh, iw, ih, ww; Evas_Coord x, y, ox, oy, cvx, cvy, cvw, cvh, iw, ih, ww;
Evas_Coord tch, tcw, alignw = 0, alignh = 0, vw, vh; Evas_Coord tch, tcw, alignw = 0, alignh = 0, vw, vh;
Eina_Bool reorder_item_move_forward = EINA_FALSE; Eina_Bool reorder_item_move_forward = EINA_FALSE;
Elm_Gengrid_Data *wsd;
Eina_Bool was_realized; Eina_Bool was_realized;
Elm_Gen_Item_Type *item; Elm_Gen_Item_Type *item;
long items_count; long items_count;
int item_pos; int item_pos;
item = GG_IT(it); item = GG_IT(it);
wsd = GG_IT(it)->wsd; ELM_GENGRID_DATA_GET_FROM_ITEM(it, wsd);
it->x = cx; it->x = cx;
it->y = cy; it->y = cy;
@ -3114,7 +3110,7 @@ _item_position_update(Eina_Inlist *list,
static void static void
_elm_gengrid_item_del_not_serious(Elm_Gen_Item *it) _elm_gengrid_item_del_not_serious(Elm_Gen_Item *it)
{ {
Elm_Gengrid_Data *sd = GG_IT(it)->wsd; ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
elm_widget_item_pre_notify_del(it); elm_widget_item_pre_notify_del(it);
it->generation = sd->generation - 1; /* This means that the item is deleted */ it->generation = sd->generation - 1; /* This means that the item is deleted */
@ -3137,7 +3133,7 @@ _elm_gengrid_item_del_not_serious(Elm_Gen_Item *it)
static void static void
_elm_gengrid_item_del_serious(Elm_Gen_Item *it) _elm_gengrid_item_del_serious(Elm_Gen_Item *it)
{ {
Elm_Gengrid_Data *sd = GG_IT(it)->wsd; ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
_elm_gengrid_item_del_not_serious(it); _elm_gengrid_item_del_not_serious(it);
sd->items = eina_inlist_remove(sd->items, EINA_INLIST_GET(it)); sd->items = eina_inlist_remove(sd->items, EINA_INLIST_GET(it));
@ -3161,9 +3157,10 @@ static void
_item_del(Elm_Gen_Item *it) _item_del(Elm_Gen_Item *it)
{ {
Evas_Object *obj = WIDGET(it); Evas_Object *obj = WIDGET(it);
ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
evas_event_freeze(evas_object_evas_get(obj)); evas_event_freeze(evas_object_evas_get(obj));
GG_IT(it)->wsd->selected = eina_list_remove(GG_IT(it)->wsd->selected, it); sd->selected = eina_list_remove(sd->selected, it);
if (it->realized) _elm_gengrid_item_unrealize(it, EINA_FALSE); if (it->realized) _elm_gengrid_item_unrealize(it, EINA_FALSE);
_elm_gengrid_item_del_serious(it); _elm_gengrid_item_del_serious(it);
elm_gengrid_item_class_unref((Elm_Gengrid_Item_Class *)it->itc); elm_gengrid_item_class_unref((Elm_Gengrid_Item_Class *)it->itc);
@ -3416,7 +3413,7 @@ static void
_item_select(Elm_Gen_Item *it) _item_select(Elm_Gen_Item *it)
{ {
Evas_Object *obj = WIDGET(it); Evas_Object *obj = WIDGET(it);
Elm_Gengrid_Data *sd = GG_IT(it)->wsd; ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
if (_is_no_select(it) || if (_is_no_select(it) ||
(it->generation < sd->generation) || (it->generation < sd->generation) ||
@ -3972,11 +3969,10 @@ elm_gengrid_item_selected_set(Elm_Object_Item *item,
Eina_Bool selected) Eina_Bool selected)
{ {
Elm_Gen_Item *it = (Elm_Gen_Item *)item; Elm_Gen_Item *it = (Elm_Gen_Item *)item;
Elm_Gengrid_Data *sd;
ELM_GENGRID_ITEM_CHECK_OR_RETURN(it); ELM_GENGRID_ITEM_CHECK_OR_RETURN(it);
ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
sd = GG_IT(it)->wsd;
if ((it->generation < sd->generation) || elm_widget_item_disabled_get(it)) if ((it->generation < sd->generation) || elm_widget_item_disabled_get(it))
return; return;
selected = !!selected; selected = !!selected;
@ -4534,10 +4530,9 @@ elm_gengrid_item_show(Elm_Object_Item *item,
Elm_Gengrid_Item_Scrollto_Type type) Elm_Gengrid_Item_Scrollto_Type type)
{ {
Elm_Gen_Item *it = (Elm_Gen_Item *)item; Elm_Gen_Item *it = (Elm_Gen_Item *)item;
Elm_Gengrid_Data *sd;
ELM_GENGRID_ITEM_CHECK_OR_RETURN(it); ELM_GENGRID_ITEM_CHECK_OR_RETURN(it);
sd = GG_IT(it)->wsd; ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
if ((it->generation < sd->generation)) return; if ((it->generation < sd->generation)) return;
@ -4552,11 +4547,10 @@ EAPI void
elm_gengrid_item_bring_in(Elm_Object_Item *item, elm_gengrid_item_bring_in(Elm_Object_Item *item,
Elm_Gengrid_Item_Scrollto_Type type) Elm_Gengrid_Item_Scrollto_Type type)
{ {
Elm_Gengrid_Data *sd;
Elm_Gen_Item *it = (Elm_Gen_Item *)item; Elm_Gen_Item *it = (Elm_Gen_Item *)item;
ELM_GENGRID_ITEM_CHECK_OR_RETURN(it); ELM_GENGRID_ITEM_CHECK_OR_RETURN(it);
sd = GG_IT(it)->wsd; ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
if (it->generation < sd->generation) return; if (it->generation < sd->generation) return;

16
legacy/elementary/src/lib/elm_list.c
View File

@ -92,7 +92,7 @@ _is_no_select(Elm_List_Item *it)
static inline void static inline void
_elm_list_item_free(Elm_List_Item *it) _elm_list_item_free(Elm_List_Item *it)
{ {
ELM_LIST_DATA_GET(WIDGET(it), sd); ELM_LIST_DATA_GET_FROM_ITEM(it, sd);
if (sd->focused_item == (Elm_Object_Item *)it) if (sd->focused_item == (Elm_Object_Item *)it)
sd->focused_item = NULL; sd->focused_item = NULL;
@ -251,7 +251,7 @@ _elm_list_item_content_focus_set(Elm_List_Item *it, Elm_Focus_Direction dir,
Eina_Bool h_mode) Eina_Bool h_mode)
{ {
if (!it) return EINA_FALSE; if (!it) return EINA_FALSE;
ELM_LIST_DATA_GET(WIDGET(it), sd); ELM_LIST_DATA_GET_FROM_ITEM(it, sd);
if (!sd->focus_on_selection_enabled) return EINA_FALSE; if (!sd->focus_on_selection_enabled) return EINA_FALSE;
if ((h_mode && (dir != ELM_FOCUS_UP) && (dir != ELM_FOCUS_DOWN)) || if ((h_mode && (dir != ELM_FOCUS_UP) && (dir != ELM_FOCUS_DOWN)) ||
@ -1113,7 +1113,7 @@ _elm_list_elm_widget_theme_apply(Eo *obj, Elm_List_Data *sd)
static void static void
_elm_list_item_focused(Elm_List_Item *it) _elm_list_item_focused(Elm_List_Item *it)
{ {
ELM_LIST_DATA_GET(WIDGET(it), sd); ELM_LIST_DATA_GET_FROM_ITEM(it, sd);
Evas_Coord x, y, w, h, sx, sy, sw, sh; Evas_Coord x, y, w, h, sx, sy, sw, sh;
const char *focus_raise; const char *focus_raise;
@ -1464,7 +1464,7 @@ _swipe_cancel(void *data)
Elm_List_Item *it = data; Elm_List_Item *it = data;
ELM_LIST_ITEM_CHECK_OR_RETURN(it, ECORE_CALLBACK_CANCEL); ELM_LIST_ITEM_CHECK_OR_RETURN(it, ECORE_CALLBACK_CANCEL);
ELM_LIST_DATA_GET(WIDGET(it), sd); ELM_LIST_DATA_GET_FROM_ITEM(it, sd);
sd->swipe = EINA_FALSE; sd->swipe = EINA_FALSE;
sd->movements = 0; sd->movements = 0;
@ -1526,7 +1526,7 @@ _swipe_do(Elm_List_Item *it)
int i, sum = 0; int i, sum = 0;
ELM_LIST_ITEM_CHECK_OR_RETURN(it); ELM_LIST_ITEM_CHECK_OR_RETURN(it);
ELM_LIST_DATA_GET(WIDGET(it), sd); ELM_LIST_DATA_GET_FROM_ITEM(it, sd);
sd->swipe = EINA_FALSE; sd->swipe = EINA_FALSE;
for (i = 0; i < sd->movements; i++) for (i = 0; i < sd->movements; i++)
@ -2802,7 +2802,7 @@ elm_list_item_show(Elm_Object_Item *it)
Evas_Coord x, y, w, h; Evas_Coord x, y, w, h;
ELM_LIST_ITEM_CHECK_OR_RETURN(it); ELM_LIST_ITEM_CHECK_OR_RETURN(it);
ELM_LIST_DATA_GET(WIDGET(it), sd); ELM_LIST_DATA_GET_FROM_ITEM(it, sd);
evas_smart_objects_calculate(evas_object_evas_get(sd->box)); evas_smart_objects_calculate(evas_object_evas_get(sd->box));
evas_object_geometry_get(sd->box, &bx, &by, &bw, &bh); evas_object_geometry_get(sd->box, &bx, &by, &bw, &bh);
@ -2820,7 +2820,7 @@ elm_list_item_bring_in(Elm_Object_Item *it)
Evas_Coord x, y, w, h; Evas_Coord x, y, w, h;
ELM_LIST_ITEM_CHECK_OR_RETURN(it); ELM_LIST_ITEM_CHECK_OR_RETURN(it);
ELM_LIST_DATA_GET(WIDGET(it), sd); ELM_LIST_DATA_GET_FROM_ITEM(it, sd);
evas_smart_objects_calculate(evas_object_evas_get(sd->box)); evas_smart_objects_calculate(evas_object_evas_get(sd->box));
evas_object_geometry_get(sd->box, &bx, &by, &bw, &bh); evas_object_geometry_get(sd->box, &bx, &by, &bw, &bh);
@ -2937,7 +2937,7 @@ _elm_list_item_coordinates_adjust(Elm_List_Item *it,
Evas_Coord *w, Evas_Coord *w,
Evas_Coord *h) Evas_Coord *h)
{ {
ELM_LIST_DATA_GET(WIDGET(it), sd); ELM_LIST_DATA_GET_FROM_ITEM(it, sd);
Evas_Coord ix, iy, iw, ih, vx, vy, vw, vh; Evas_Coord ix, iy, iw, ih, vx, vy, vw, vh;