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
This commit is contained in:
parent
e2be96901e
commit
e1ed56c327
|
@ -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);
|
evas_object_image_colorspace_set(cw->obj, EVAS_COLORSPACE_ARGB8888);
|
||||||
_e_comp_object_alpha_set(cw);
|
_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
|
#ifdef BORDER_ZOOMAPS
|
||||||
e_comp_object_zoomap_set(o, 1);
|
e_comp_object_zoomap_set(o, 1);
|
||||||
#else
|
#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_IN, _e_comp_object_ssd_mouse_in);
|
||||||
evas_object_event_callback_del(cw->obj, EVAS_CALLBACK_MOUSE_OUT, _e_comp_object_ssd_mouse_out);
|
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_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);
|
evas_object_event_callback_add(cw->obj, EVAS_CALLBACK_MOUSE_OUT, _e_comp_object_ssd_mouse_out, cw);
|
||||||
|
|
Loading…
Reference in New Issue