From ef92c6bb2d9de846ad64a7de3c9bd16e2584e918 Mon Sep 17 00:00:00 2001 From: Jaehwan Kim Date: Wed, 5 Aug 2015 14:46:01 +0900 Subject: [PATCH] focus: add del callback always. When the window treats focused object, it should always check that it is deleted. @fix Change-Id: I461c9e04c90b7722d85a2f42b13888edccdf0e5c origin: upstream --- src/lib/elm_win.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index 99a80e4..0ea360a 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -1575,8 +1575,6 @@ _elm_win_focus_target_callbacks_add(Elm_Win_Data *sd) (obj, EVAS_CALLBACK_MOVE, _elm_win_focus_target_move, sd->obj); evas_object_event_callback_add (obj, EVAS_CALLBACK_RESIZE, _elm_win_focus_target_resize, sd->obj); - evas_object_event_callback_add - (obj, EVAS_CALLBACK_DEL, _elm_win_focus_target_del, sd->obj); } static void @@ -1588,8 +1586,6 @@ _elm_win_focus_target_callbacks_del(Elm_Win_Data *sd) (obj, EVAS_CALLBACK_MOVE, _elm_win_focus_target_move, sd->obj); evas_object_event_callback_del_full (obj, EVAS_CALLBACK_RESIZE, _elm_win_focus_target_resize, sd->obj); - evas_object_event_callback_del_full - (obj, EVAS_CALLBACK_DEL, _elm_win_focus_target_del, sd->obj); } static void @@ -1610,6 +1606,9 @@ _elm_win_object_focus_in(void *data, else _elm_win_focus_target_callbacks_add(sd); + evas_object_event_callback_add + (target, EVAS_CALLBACK_DEL, _elm_win_focus_target_del, sd->obj); + _elm_win_focus_highlight_reconfigure_job_start(sd); } @@ -1626,6 +1625,10 @@ _elm_win_object_focus_out(void *data, if (!sd->focus_highlight.cur.in_theme) _elm_win_focus_target_callbacks_del(sd); + evas_object_event_callback_del_full + (sd->focus_highlight.cur.target, + EVAS_CALLBACK_DEL, _elm_win_focus_target_del, sd->obj); + sd->focus_highlight.cur.target = NULL; sd->focus_highlight.cur.in_theme = EINA_FALSE; @@ -1641,6 +1644,9 @@ _elm_win_focus_highlight_shutdown(Elm_Win_Data *sd) elm_widget_signal_emit(sd->focus_highlight.cur.target, "elm,action,focus_highlight,hide", "elm"); _elm_win_focus_target_callbacks_del(sd); + evas_object_event_callback_del_full + (sd->focus_highlight.cur.target, + EVAS_CALLBACK_DEL, _elm_win_focus_target_del, sd->obj); sd->focus_highlight.cur.target = NULL; } ELM_SAFE_FREE(sd->focus_highlight.fobj, evas_object_del); @@ -2446,6 +2452,10 @@ _elm_win_focus_highlight_init(Elm_Win_Data *sd) sd->focus_highlight.cur.in_theme = EINA_TRUE; else _elm_win_focus_target_callbacks_add(sd); + + evas_object_event_callback_add + (sd->focus_highlight.cur.target, + EVAS_CALLBACK_DEL, _elm_win_focus_target_del, sd->obj); } sd->focus_highlight.prev.target = NULL; -- 2.7.4