summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-08-30 11:04:31 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-08-30 15:13:40 +0900
commit062145b605acdc05a6f37599e97d391f11d9fcc3 (patch)
treed5ba87dce25859f0648b378174cce2014d1642bc
parent2edf50cb10f6ce5e6fc8b04492413c41678e7d85 (diff)
win: Fix ERR message with object,focus,in
enventor exhibits this issue, where the focus target is NULL in some cases. The ERR message was harmless, but it's good to avoid it and be explicit that the object should be non NULL when adding event callbacks.
-rw-r--r--src/lib/elementary/efl_ui_win.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 76d0762e4e..2c842499a8 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -2308,13 +2308,16 @@ _elm_win_object_focus_in(void *data,
2308 2308
2309 target = _elm_win_focus_target_get(obj); 2309 target = _elm_win_focus_target_get(obj);
2310 sd->focus_highlight.cur.target = target; 2310 sd->focus_highlight.cur.target = target;
2311 if (target && elm_widget_highlight_in_theme_get(target))
2312 sd->focus_highlight.cur.in_theme = EINA_TRUE;
2313 else
2314 _elm_win_focus_target_callbacks_add(sd);
2315 2311
2316 evas_object_event_callback_add 2312 if (target)
2317 (target, EVAS_CALLBACK_DEL, _elm_win_focus_target_del, sd->obj); 2313 {
2314 if (elm_widget_highlight_in_theme_get(target))
2315 sd->focus_highlight.cur.in_theme = EINA_TRUE;
2316 else
2317 _elm_win_focus_target_callbacks_add(sd);
2318 evas_object_event_callback_add
2319 (target, EVAS_CALLBACK_DEL, _elm_win_focus_target_del, sd->obj);
2320 }
2318 2321
2319 _elm_win_focus_highlight_reconfigure_job_start(sd); 2322 _elm_win_focus_highlight_reconfigure_job_start(sd);
2320} 2323}