From e1ed56c327f1ba03423e828542e749bb1a7af1ee Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 17 Mar 2017 18:47:09 -0400 Subject: [PATCH] account for late object setup when adding ssd mouse in/out callbacks internal windows have a different setup order in which the frame is created before any of the other internal objects in a comp object --- src/bin/e_comp_object.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 67e715706..4ac3b97c0 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -1782,6 +1782,12 @@ _e_comp_intercept_show(void *data, Evas_Object *obj EINA_UNUSED) evas_object_image_colorspace_set(cw->obj, EVAS_COLORSPACE_ARGB8888); _e_comp_object_alpha_set(cw); + if (cw->frame_object) + { + evas_object_event_callback_add(cw->obj, EVAS_CALLBACK_MOUSE_IN, _e_comp_object_ssd_mouse_in, cw); + evas_object_event_callback_add(cw->obj, EVAS_CALLBACK_MOUSE_OUT, _e_comp_object_ssd_mouse_out, cw); + } + #ifdef BORDER_ZOOMAPS e_comp_object_zoomap_set(o, 1); #else @@ -3521,7 +3527,7 @@ reshadow: evas_object_event_callback_del(cw->obj, EVAS_CALLBACK_MOUSE_IN, _e_comp_object_ssd_mouse_in); evas_object_event_callback_del(cw->obj, EVAS_CALLBACK_MOUSE_OUT, _e_comp_object_ssd_mouse_out); } - else + else if (cw->obj) { evas_object_event_callback_add(cw->obj, EVAS_CALLBACK_MOUSE_IN, _e_comp_object_ssd_mouse_in, cw); evas_object_event_callback_add(cw->obj, EVAS_CALLBACK_MOUSE_OUT, _e_comp_object_ssd_mouse_out, cw);