From 6effdae15756dd839127831f2ab47a0d7d066338 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 27 Jan 2014 08:49:09 -0500 Subject: [PATCH] fix comp util adding of already-visible objects this fixes pager popups which don't use the new style of popup adding --- src/bin/e_comp_object.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index f339377d1..c09374ef4 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -2192,15 +2192,6 @@ e_comp_object_util_add(Evas_Object *obj, E_Comp_Object_Type type) else e_comp_object_signal_emit(o, "e,state,shadow,off", "e"); - if (evas_object_visible_get(obj)) - { - evas_object_show(o); - e_comp_object_signal_emit(o, "e,state,visible", "e"); - evas_object_ref(o); - } - else - e_comp_object_signal_emit(o, "e,state,hidden", "e"); - evas_object_geometry_get(obj, &x, &y, &w, &h); evas_object_geometry_set(o, x, y, w, h); evas_object_pass_events_set(o, evas_object_pass_events_get(obj)); @@ -2222,10 +2213,15 @@ e_comp_object_util_add(Evas_Object *obj, E_Comp_Object_Type type) evas_object_event_callback_add(o, EVAS_CALLBACK_DEL, _e_comp_object_util_del, z); evas_object_event_callback_add(o, EVAS_CALLBACK_RESIZE, _e_comp_object_util_moveresize, z); + e_comp_object_signal_emit(o, "e,state,hidden", "e"); + edje_object_part_swallow(o, "e.swallow.content", z ?: obj); _e_comp_object_event_add(o); + if (evas_object_visible_get(obj)) + evas_object_show(o); + return o; }