discomfitor pushed a commit to branch master.
commit 477aaa822e36cb440b5cf9a3ff3d04f9100d4289
Author: Mike Blumenkrantz <[email protected]>
Date: Tue Jun 11 09:50:58 2013 +0100
zoomaps strike again: only enable for popups and menus now
fixes clicking desktop icons when the efm object is not at 0,0
---
src/bin/e_comp.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 7ffca77..285f55e 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -1973,8 +1973,8 @@ _e_comp_win_mirror_add(E_Comp_Win *cw)
{
/* FIXME: the first mirror shown with vsync enabled won't render
immediately */
evas_object_image_alpha_set(o, 1);
- evas_object_geometry_get(cw->zoomobj, NULL, NULL, &w, &h);
- evas_object_image_source_set(o, cw->zoomobj);
+ evas_object_geometry_get(cw->zoomobj ?: cw->obj, NULL, NULL, &w, &h);
+ evas_object_image_source_set(o, cw->zoomobj ?: cw->obj);
}
evas_object_image_data_update_add(o, 0, 0, w, h);
return o;
@@ -2030,8 +2030,11 @@ _e_comp_win_dummy_add(E_Comp *c, Evas_Object *obj,
E_Object *eobj, Eina_Bool nol
cw->effect_obj = edje_object_add(c->evas);
e_theme_edje_object_set(cw->effect_obj, "base/theme/comp",
"e/comp/effects/none");
cw->shobj = edje_object_add(c->evas);
- cw->zoomobj = e_zoomap_add(c->evas);
- e_zoomap_smooth_set(cw->zoomobj, conf->smooth_windows);
+ if (cw->eobj)
+ {
+ cw->zoomobj = e_zoomap_add(c->evas);
+ e_zoomap_smooth_set(cw->zoomobj, conf->smooth_windows);
+ }
_e_comp_win_shadow_setup(cw);
edje_object_part_swallow(cw->effect_obj, "e.swallow.content", cw->shobj);
--
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
