projects
/
framework
/
uifw
/
elementary.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Elementary migration revision 70492
[framework/uifw/elementary.git]
/
src
/
lib
/
elm_genlist.c
diff --git
a/src/lib/elm_genlist.c
b/src/lib/elm_genlist.c
index
66fcdd0
..
3b081b8
100644
(file)
--- a/
src/lib/elm_genlist.c
+++ b/
src/lib/elm_genlist.c
@@
-1691,9
+1691,9
@@
_scr_hold_timer_cb(void *data)
static void
_decorate_item_finished_signal_cb(void *data,
static void
_decorate_item_finished_signal_cb(void *data,
- Evas_Object *obj,
- const char *emission __UNUSED__,
- const char *source __UNUSED__)
+
Evas_Object *obj,
+
const char *emission __UNUSED__,
+
const char *source __UNUSED__)
{
if (!data) return;
if (!obj) return;
{
if (!data) return;
if (!obj) return;
@@
-1888,7
+1888,6
@@
_elm_genlist_item_state_update(Elm_Gen_Item *it, Item_Cache *itc)
{
edje_object_signal_emit(VIEW(it),
"elm,state,selected", "elm");
{
edje_object_signal_emit(VIEW(it),
"elm,state,selected", "elm");
-
if (it->deco_all_view)
edje_object_signal_emit(it->deco_all_view,
"elm,state,selected", "elm");
if (it->deco_all_view)
edje_object_signal_emit(it->deco_all_view,
"elm,state,selected", "elm");
@@
-1959,10
+1958,10
@@
_content_unfocused(void *data, Evas_Object *obj __UNUSED__, void *event_info __U
static Eina_List *
_item_mode_content_realize(Elm_Gen_Item *it,
static Eina_List *
_item_mode_content_realize(Elm_Gen_Item *it,
- Evas_Object *target,
- Eina_List **source,
- const char *parts,
- Eina_List **contents_list)
+ Evas_Object
*target,
+ Eina_List
**source,
+ const char
*parts,
+ Eina_List
**contents_list)
{
Eina_List *res = *contents_list;
{
Eina_List *res = *contents_list;
@@
-2004,10
+2003,10
@@
_item_mode_content_realize(Elm_Gen_Item *it,
static Eina_List*
_item_mode_content_unrealize(Elm_Gen_Item *it,
static Eina_List*
_item_mode_content_unrealize(Elm_Gen_Item *it,
- Evas_Object *target,
- Eina_List **source,
- const char *parts,
- Eina_List **contents_list)
+ Evas_Object
*target,
+ Eina_List
**source,
+ const char
*parts,
+ Eina_List
**contents_list)
{
Eina_List *res = *contents_list;
{
Eina_List *res = *contents_list;
@@
-2046,9
+2045,9
@@
_item_cache_free(Item_Cache *itc)
static void
_item_text_realize(Elm_Gen_Item *it,
static void
_item_text_realize(Elm_Gen_Item *it,
- Evas_Object *target,
- Eina_List **source,
- const char *parts)
+ Evas_Object
*target,
+ Eina_List
**source,
+ const char
*parts)
{
if (it->itc->func.text_get)
{
{
if (it->itc->func.text_get)
{
@@
-2080,9
+2079,9
@@
_item_text_realize(Elm_Gen_Item *it,
static Eina_List *
_item_content_unrealize(Elm_Gen_Item *it,
static Eina_List *
_item_content_unrealize(Elm_Gen_Item *it,
- Evas_Object *target,
- Eina_List **source,
- const char *parts)
+ Evas_Object
*target,
+ Eina_List
**source,
+ const char
*parts)
{
Eina_List *res = it->content_objs;
{
Eina_List *res = it->content_objs;
@@
-2112,9
+2111,9
@@
_item_content_unrealize(Elm_Gen_Item *it,
static Eina_List *
_item_content_realize(Elm_Gen_Item *it,
static Eina_List *
_item_content_realize(Elm_Gen_Item *it,
- Evas_Object *target,
- Eina_List **source,
- const char *parts)
+ Evas_Object
*target,
+ Eina_List
**source,
+ const char
*parts)
{
Eina_List *res = it->content_objs;
{
Eina_List *res = it->content_objs;
@@
-2163,9
+2162,9
@@
_item_content_realize(Elm_Gen_Item *it,
static void
_item_state_realize(Elm_Gen_Item *it,
static void
_item_state_realize(Elm_Gen_Item *it,
- Evas_Object *target,
- Eina_List **source,
- const char *parts)
+ Evas_Object
*target,
+ Eina_List
**source,
+ const char
*parts)
{
if (it->itc->func.state_get)
{
{
if (it->itc->func.state_get)
{
@@
-2636,9
+2635,9
@@
_reorder_move_animator_cb(void *data)
static void
_item_position(Elm_Gen_Item *it,
static void
_item_position(Elm_Gen_Item *it,
- Evas_Object
*view,
- Evas_Coord
it_x,
- Evas_Coord
it_y)
+ Evas_Object *view,
+ Evas_Coord it_x,
+ Evas_Coord it_y)
{
if (!it) return;
if (!view) return;
{
if (!it) return;
if (!view) return;
@@
-3017,7
+3016,7
@@
_calc_job(void *data)
dy = 0;
break;
}
dy = 0;
break;
}
- if (
wd->show_item
)
+ if (
(wd->show_item) && (wd->show_item->item->block)
)
{
if ((pan_w > (wd->show_item->x + wd->show_item->item->block->x)) &&
(pan_h > (wd->show_item->y + wd->show_item->item->block->y + dy)))
{
if ((pan_w > (wd->show_item->x + wd->show_item->item->block->x)) &&
(pan_h > (wd->show_item->y + wd->show_item->item->block->y + dy)))
@@
-3510,17
+3509,17
@@
_scr_anim_stop(void *data,
}
static void
}
static void
-_scr_drag_start(void
*data,
- Evas_Object
*obj __UNUSED__,
- void
*event_info __UNUSED__)
+_scr_drag_start(void *data,
+ Evas_Object *obj __UNUSED__,
+ void *event_info __UNUSED__)
{
evas_object_smart_callback_call(data, SIG_SCROLL_DRAG_START, NULL);
}
static void
{
evas_object_smart_callback_call(data, SIG_SCROLL_DRAG_START, NULL);
}
static void
-_scr_drag_stop(void
*data,
- Evas_Object
*obj __UNUSED__,
- void
*event_info __UNUSED__)
+_scr_drag_stop(void *data,
+ Evas_Object *obj __UNUSED__,
+ void *event_info __UNUSED__)
{
evas_object_smart_callback_call(data, SIG_SCROLL_DRAG_STOP, NULL);
}
{
evas_object_smart_callback_call(data, SIG_SCROLL_DRAG_STOP, NULL);
}
@@
-4199,7
+4198,7
@@
_item_block_new(Widget_Data *wd, Eina_Bool prepend)
}
static Eina_Bool
}
static Eina_Bool
-_item_block_add(Widget_Data *wd,
+_item_block_add(Widget_Data
*wd,
Elm_Gen_Item *it)
{
Item_Block *itb = NULL;
Elm_Gen_Item *it)
{
Item_Block *itb = NULL;
@@
-4519,8
+4518,8
@@
_item_idle_enterer(void *data)
}
static void
}
static void
-_item_queue(Widget_Data *wd,
- Elm_Gen_Item *it,
+_item_queue(Widget_Data
*wd,
+ Elm_Gen_Item
*it,
Eina_Compare_Cb cb)
{
if (it->item->queued) return;
Eina_Compare_Cb cb)
{
if (it->item->queued) return;
@@
-5226,8
+5225,8
@@
_elm_genlist_move_items_set(Elm_Gen_Item *it)
}
EAPI void
}
EAPI void
-elm_genlist_item_expanded_set(Elm_Object_Item
*it,
- Eina_Bool
expanded)
+elm_genlist_item_expanded_set(Elm_Object_Item *it,
+ Eina_Bool expanded)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
@@
-5302,13
+5301,13
@@
elm_genlist_item_display_only_get(const Elm_Object_Item *it)
}
static Eina_Bool
}
static Eina_Bool
-_elm_genlist_item_compute_coordinates(Elm_Object_Item *it,
+_elm_genlist_item_compute_coordinates(Elm_Object_Item
*it,
Elm_Genlist_Item_Scrollto_Type type,
Elm_Genlist_Item_Scrollto_Type type,
- Eina_Bool bring_in,
- Evas_Coord *x,
- Evas_Coord *y,
- Evas_Coord *w,
- Evas_Coord *h)
+ Eina_Bool
bring_in,
+ Evas_Coord
*x,
+ Evas_Coord
*y,
+ Evas_Coord
*w,
+ Evas_Coord
*h)
{
Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
Evas_Coord gith = 0;
{
Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
Evas_Coord gith = 0;
@@
-5427,8
+5426,8
@@
elm_genlist_item_update(Elm_Object_Item *it)
}
EAPI void
}
EAPI void
-elm_genlist_item_fields_update(Elm_Object_Item *it,
- const char *parts,
+elm_genlist_item_fields_update(Elm_Object_Item
*it,
+ const char
*parts,
Elm_Genlist_Item_Field_Type itf)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
Elm_Genlist_Item_Field_Type itf)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
@@
-5485,7
+5484,7
@@
elm_genlist_item_fields_update(Elm_Object_Item *it,
}
EAPI void
}
EAPI void
-elm_genlist_item_item_class_update(Elm_Object_Item *it,
+elm_genlist_item_item_class_update(Elm_Object_Item
*it,
const Elm_Genlist_Item_Class *itc)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
const Elm_Genlist_Item_Class *itc)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
@@
-5570,7
+5569,7
@@
elm_genlist_item_tooltip_text_set(Elm_Object_Item *it,
}
EAPI void
}
EAPI void
-elm_genlist_item_tooltip_content_cb_set(Elm_Object_Item *it,
+elm_genlist_item_tooltip_content_cb_set(Elm_Object_Item
*it,
Elm_Tooltip_Item_Content_Cb func,
const void *data,
Evas_Smart_Cb del_cb)
Elm_Tooltip_Item_Content_Cb func,
const void *data,
Evas_Smart_Cb del_cb)
@@
-5641,7
+5640,7
@@
elm_genlist_item_tooltip_style_get(const Elm_Object_Item *it)
EAPI Eina_Bool
elm_genlist_item_tooltip_window_mode_set(Elm_Object_Item *it,
EAPI Eina_Bool
elm_genlist_item_tooltip_window_mode_set(Elm_Object_Item *it,
- Eina_Bool disable)
+ Eina_Bool
disable)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
@@
-5688,8
+5687,8
@@
elm_genlist_item_cursor_unset(Elm_Object_Item *it)
}
EAPI void
}
EAPI void
-elm_genlist_item_cursor_style_set(Elm_Object_Item
*it,
- const char
*style)
+elm_genlist_item_cursor_style_set(Elm_Object_Item *it,
+ const char *style)
{
elm_widget_item_cursor_style_set(it, style);
}
{
elm_widget_item_cursor_style_set(it, style);
}
@@
-5874,9
+5873,9
@@
elm_genlist_realized_items_update(Evas_Object *obj)
}
EAPI void
}
EAPI void
-elm_genlist_item_decorate_mode_set(Elm_Object_Item
*it,
- const char
*decorate_it_type,
- Eina_Bool
decorate_it_set)
+elm_genlist_item_decorate_mode_set(Elm_Object_Item *it,
+ const char *decorate_it_type,
+ Eina_Bool decorate_it_set)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
@@
-6146,7
+6145,7
@@
elm_genlist_highlight_mode_get(const Evas_Object *obj)
}
EAPI void
}
EAPI void
-elm_genlist_item_select_mode_set(Elm_Object_Item *it,
+elm_genlist_item_select_mode_set(Elm_Object_Item
*it,
Elm_Object_Select_Mode mode)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
Elm_Object_Select_Mode mode)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);