enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

elm: Use appropriate add/del_full for evas event callbacks. 

SVN revision: 64536
This commit is contained in:
Daniel Juyung Seo 2011-10-31 00:13:32 +00:00
parent 771202d8f8
commit bafe9c7426
20 changed files with 94 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
legacy/elementary/TODO
View File

@ -9,3 +9,6 @@ Things That Just Need To Be Rewritten (tm):
"Features"
elm_object_icon_s/get() should be implemented for most widgets to reduce api
callbacks add/del
pager, panes

15
legacy/elementary/src/lib/elc_fileselector_button.c
View File

@ -22,6 +22,7 @@ struct _Widget_Data
static const char *widtype = NULL;
static void _del_pre_hook(Evas_Object *obj);
static void _del_hook(Evas_Object *obj);
static void _theme_hook(Evas_Object *obj);
static void _disable_hook(Evas_Object *obj);
@ -30,6 +31,9 @@ static void _changed_size_hints(void *data,
Evas *e,
Evas_Object *obj,
void *event_info);
static void _button_clicked(void *data,
Evas_Object *obj,
void *event_info);
static void _on_focus_hook(void *data,
Evas_Object *obj);
static void _selection_done(void *data,
@ -43,6 +47,16 @@ static const Evas_Smart_Cb_Description _signals[] = {
{NULL, NULL}
};
static void
_del_pre_hook(Evas_Object *obj)
{
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
evas_object_event_callback_del_full(wd->btn, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
evas_object_smart_callback_del(wd->btn, "clicked", _button_clicked);
}
static void
_del_hook(Evas_Object *obj)
{
@ -274,6 +288,7 @@ elm_fileselector_button_add(Evas_Object *parent)
elm_widget_sub_object_add(parent, obj);
elm_widget_on_focus_hook_set(obj, _on_focus_hook, NULL);
elm_widget_data_set(obj, wd);
elm_widget_del_pre_hook_set(obj, _del_pre_hook);
elm_widget_del_hook_set(obj, _del_hook);
elm_widget_theme_hook_set(obj, _theme_hook);
elm_widget_disable_hook_set(obj, _disable_hook);

14
legacy/elementary/src/lib/elc_fileselector_entry.c
View File

@ -62,6 +62,8 @@ SIG_FWD(SELECTION_CUT)
SIG_FWD(UNPRESSED)
#undef SIG_FWD
static void _del_pre_hook(Evas_Object *obj);
static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl);
static void
@ -82,6 +84,17 @@ _ACTIVATED_fwd(void *data, Evas_Object *obj __UNUSED__, void *event_info)
evas_object_smart_callback_call(data, SIG_ACTIVATED, event_info);
}
static void
_del_pre_hook(Evas_Object *obj)
{
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
evas_object_event_callback_del_full
(wd->button, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj);
evas_object_event_callback_del_full
(wd->entry, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj);
}
static void
_del_hook(Evas_Object *obj)
{
@ -233,6 +246,7 @@ elm_fileselector_entry_add(Evas_Object *parent)
elm_widget_type_set(obj, "fileselector_entry");
elm_widget_sub_object_add(parent, obj);
elm_widget_data_set(obj, wd);
elm_widget_del_pre_hook_set(obj, _del_pre_hook);
elm_widget_del_hook_set(obj, _del_hook);
elm_widget_disable_hook_set(obj, _disable_hook);
elm_widget_focus_next_hook_set(obj, _elm_fileselector_entry_focus_next_hook);

2
legacy/elementary/src/lib/elc_hoversel.c
View File

@ -49,6 +49,8 @@ _del_pre_hook(Evas_Object *obj)
Elm_Hoversel_Item *item;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
evas_object_event_callback_del_full(wd->btn, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
elm_hoversel_hover_end(obj);
elm_hoversel_hover_parent_set(obj, NULL);
EINA_LIST_FREE(wd->items, item)

4
legacy/elementary/src/lib/elm_bubble.c
View File

@ -281,6 +281,8 @@ elm_bubble_content_unset(Evas_Object *obj)
if (!wd->content) return NULL;
content = wd->content;
elm_widget_sub_object_del(obj, content);
evas_object_event_callback_del_full(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
edje_object_part_unswallow(wd->bbl, content);
wd->content = NULL;
return content;
@ -326,6 +328,8 @@ elm_bubble_icon_unset(Evas_Object *obj)
if (!wd->icon) return NULL;
icon = wd->icon;
elm_widget_sub_object_del(obj, icon);
evas_object_event_callback_del_full(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
edje_object_part_unswallow(wd->bbl, icon);
wd->icon = NULL;
return icon;

2
legacy/elementary/src/lib/elm_button.c
View File

@ -215,6 +215,8 @@ _content_unset_hook(Evas_Object *obj, const char *part __UNUSED__)
if (!wd->icon) return NULL;
Evas_Object *icon = wd->icon;
elm_widget_sub_object_del(obj, wd->icon);
evas_object_event_callback_del_full(wd->icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
edje_object_part_unswallow(wd->btn, wd->icon);
wd->icon = NULL;
return icon;

3
legacy/elementary/src/lib/elm_check.c
View File

@ -246,6 +246,9 @@ _content_unset_hook(Evas_Object *obj, const char *part __UNUSED__)
if (!wd->icon) return NULL;
Evas_Object *icon = wd->icon;
elm_widget_sub_object_del(obj, wd->icon);
evas_object_event_callback_del_full(wd->icon,
EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
edje_object_part_unswallow(wd->chk, wd->icon);
wd->icon = NULL;
return icon;

3
legacy/elementary/src/lib/elm_conform.c
View File

@ -160,6 +160,9 @@ _content_unset_hook(Evas_Object *obj, const char *part __UNUSED__)
if ((!wd) || (!wd->content)) return NULL;
content = wd->content;
elm_widget_sub_object_del(obj, wd->content);
evas_object_event_callback_del_full(wd->content,
EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
edje_object_part_unswallow(wd->base, wd->content);
wd->content = NULL;
return content;

6
legacy/elementary/src/lib/elm_flip.c
View File

@ -1721,6 +1721,9 @@ elm_flip_content_front_unset(Evas_Object *obj)
Evas_Object *content = wd->front.content;
evas_object_clip_unset(content);
elm_widget_sub_object_del(obj, content);
evas_object_event_callback_del_full(content,
EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
evas_object_smart_member_del(content);
wd->front.content = NULL;
return content;
@ -1736,6 +1739,9 @@ elm_flip_content_back_unset(Evas_Object *obj)
Evas_Object *content = wd->back.content;
evas_object_clip_unset(content);
elm_widget_sub_object_del(obj, content);
evas_object_event_callback_del_full(content,
EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
evas_object_smart_member_del(content);
wd->back.content = NULL;
return content;

3
legacy/elementary/src/lib/elm_frame.c
View File

@ -162,6 +162,9 @@ _content_unset_hook(Evas_Object *obj, const char *part __UNUSED__)
if (!wd->content) return NULL;
content = wd->content;
elm_widget_sub_object_del(obj, wd->content);
evas_object_event_callback_del_full(wd->content,
EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
edje_object_part_unswallow(wd->frm, wd->content);
wd->content = NULL;
return content;

3
legacy/elementary/src/lib/elm_layout.c
View File

@ -424,6 +424,9 @@ _content_unset_hook(Evas_Object *obj, const char *part)
if (!si->obj) return NULL;
content = si->obj; /* si will die in _sub_del due elm_widget_sub_object_del() */
elm_widget_sub_object_del(obj, content);
evas_object_event_callback_del_full(content,
EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, wd);
edje_object_part_unswallow(wd->lay, content);
return content;
}

2
legacy/elementary/src/lib/elm_map.c
View File

@ -2556,7 +2556,7 @@ _group_bubble_content_update(Marker_Group *group)
elm_scroller_content_set(group->sc, group->bx);
evas_object_event_callback_add(group->sc, EVAS_CALLBACK_RESIZE,
evas_object_event_callback_add(group->sc, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_bubble_sc_hits_changed_cb, group);
}

3
legacy/elementary/src/lib/elm_mapbuf.c
View File

@ -191,6 +191,9 @@ _content_unset_hook(Evas_Object *obj, const char *part __UNUSED__)
if (!wd->content) return NULL;
content = wd->content;
elm_widget_sub_object_del(obj, content);
evas_object_event_callback_add(content,
EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
evas_object_smart_member_del(content);
evas_object_color_set(wd->clip, 0, 0, 0, 0);
evas_object_clip_unset(content);

5
legacy/elementary/src/lib/elm_notify.c
View File

@ -456,6 +456,11 @@ _content_unset_hook(Evas_Object *obj, const char *part __UNUSED__)
if (!wd->content) return NULL;
content = wd->content;
elm_widget_sub_object_del(obj, wd->content);
evas_object_event_callback_del_full(wd->content,
EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
evas_object_event_callback_del_full(wd->content, EVAS_CALLBACK_RESIZE,
_content_resize, obj);
edje_object_part_unswallow(wd->notify, wd->content);
wd->content = NULL;
return content;

2
legacy/elementary/src/lib/elm_progressbar.c
View File

@ -351,6 +351,8 @@ elm_progressbar_icon_unset(Evas_Object *obj)
if (!wd->icon) return NULL;
Evas_Object *icon = wd->icon;
elm_widget_sub_object_del(obj, wd->icon);
evas_object_event_callback_del_full(wd->icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
edje_object_part_unswallow(wd->progressbar, wd->icon);
wd->icon = NULL;
return icon;

2
legacy/elementary/src/lib/elm_radio.c
View File

@ -402,6 +402,8 @@ elm_radio_icon_unset(Evas_Object *obj)
if (!wd->icon) return NULL;
Evas_Object *icon = wd->icon;
elm_widget_sub_object_del(obj, wd->icon);
evas_object_event_callback_del_full(wd->icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
edje_object_part_unswallow(wd->radio, wd->icon);
wd->icon = NULL;
return icon;

3
legacy/elementary/src/lib/elm_scroller.c
View File

@ -526,6 +526,9 @@ elm_scroller_content_unset(Evas_Object *obj)
if (!wd->content) return NULL;
content = wd->content;
elm_widget_sub_object_del(obj, wd->content);
evas_object_event_callback_del_full(wd->content,
EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
edje_object_part_unswallow(elm_smart_scroller_edje_object_get(wd->scr), wd->content);
wd->content = NULL;
return content;

6
legacy/elementary/src/lib/elm_slider.c
View File

@ -593,6 +593,9 @@ elm_slider_icon_unset(Evas_Object *obj)
if (wd->icon)
{
elm_widget_sub_object_del(obj, wd->icon);
evas_object_event_callback_del_full(wd->icon,
EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
ret = wd->icon;
edje_object_part_unswallow(wd->slider, wd->icon);
edje_object_signal_emit(wd->slider, "elm,state,icon,hidden", "elm");
@ -843,6 +846,9 @@ elm_slider_end_unset(Evas_Object *obj)
if (wd->end)
{
elm_widget_sub_object_del(obj, wd->end);
evas_object_event_callback_del_full(wd->end,
EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
ret = wd->end;
edje_object_part_unswallow(wd->slider, wd->end);
edje_object_signal_emit(wd->slider, "elm,state,end,hidden", "elm");

11
legacy/elementary/src/lib/elm_slideshow.c
View File

@ -39,6 +39,7 @@ struct _Widget_Data
};
static const char *widtype = NULL;
static void _del_pre_hook(Evas_Object *obj);
static void _del_hook(Evas_Object *obj);
static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl);
static void _theme_hook(Evas_Object *obj);
@ -97,6 +98,15 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty
return EINA_FALSE;
}
static void
_del_pre_hook(Evas_Object *obj)
{
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
evas_object_event_callback_del_full(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
}
static void
_del_hook(Evas_Object *obj)
{
@ -346,6 +356,7 @@ elm_slideshow_add(Evas_Object *parent)
elm_widget_sub_object_add(parent, obj);
elm_widget_on_focus_hook_set(obj, _on_focus_hook, NULL);
elm_widget_data_set(obj, wd);
elm_widget_del_pre_hook_set(obj, _del_pre_hook);
elm_widget_del_hook_set(obj, _del_hook);
elm_widget_theme_hook_set(obj, _theme_hook);
elm_widget_can_focus_set(obj, EINA_TRUE);

3
legacy/elementary/src/lib/elm_win.c
View File

@ -2612,6 +2612,9 @@ elm_win_inwin_content_unset(Evas_Object *obj)
if (!wd->content) return NULL;
Evas_Object *content = wd->content;
elm_widget_sub_object_del(obj, wd->content);
evas_object_event_callback_del_full(wd->content,
EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
edje_object_part_unswallow(wd->frm, wd->content);
wd->content = NULL;
return content;