discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=8c2396cd9b04ad3464cb3dd3aa0bb710513d3456
commit 8c2396cd9b04ad3464cb3dd3aa0bb710513d3456
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Fri Feb 26 15:02:15 2016 -0500
setup comp util object zoomap before setting its child
this avoids some minor canvas thrashing since the zoomap will try
to reapply existing geometries to the child instead of setting 0 and
triggering infinite callbacks
---
src/bin/e_comp_object.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index cb20f71..8133dfd 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -2723,11 +2723,11 @@ e_comp_object_util_add(Evas_Object *obj,
E_Comp_Object_Type type)
evas_object_pass_events_set(o, evas_object_pass_events_get(obj));
z = e_zoomap_add(e_comp->evas);
+ evas_object_show(z);
+ evas_object_geometry_set(z, x, y, w, h);
e_zoomap_child_edje_solid_setup(z);
e_zoomap_smooth_set(z, conf->smooth_windows);
e_zoomap_child_set(z, obj);
- e_zoomap_child_resize(z, w, h);
- evas_object_show(z);
edje_object_signal_callback_add(o, "e,action,*,done", "e",
_e_comp_object_util_done_defer, z);
evas_object_intercept_show_callback_add(o, _e_comp_object_util_show, z);
--
