discomfitor pushed a commit to branch master.
commit ca76e0f6e353715c855d3055b35c736f8216ec2e
Author: Mike Blumenkrantz <[email protected]>
Date: Thu Aug 15 09:16:12 2013 +0100
event mask comp shapes which set repeat_events more accurately
---
src/bin/e_comp.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 1f71303..4e46504 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -3779,7 +3779,8 @@
_e_comp_shapes_update_comp_win_shape_comp_helper(E_Comp_Win *cw, Eina_Tiler *tb)
ERR("SHAPED OVERRIDE WINDOW DETECTED: INPUT SHAPE CUTTING BROKEN!");
return;
}
- if (cw->invalid || cw->real_hid || (!cw->visible) || (!cw->shape->visible)
|| evas_object_pass_events_get(cw->effect_obj))
+ if (cw->invalid || cw->real_hid || (!cw->visible) || (!cw->shape->visible)
||
+ evas_object_pass_events_get(cw->effect_obj) ||
evas_object_repeat_events_get(cw->effect_obj))
{
SHAPE_DBG("SKIPPING SHAPE");
return;
@@ -3945,7 +3946,7 @@ _e_comp_shapes_update_job(E_Comp *c)
,&rl
#endif
);
- else if (evas_object_visible_get(ch) &&
(!evas_object_pass_events_get(ch)))
+ else if (evas_object_visible_get(ch) &&
(!evas_object_pass_events_get(ch)) && (!evas_object_repeat_events_get(ch)))
{
SHAPE_INF("COMP OBJ: %p", ch);
e_layout_child_geometry_get(ch, &x, &y, &w, &h);
@@ -3954,7 +3955,7 @@ _e_comp_shapes_update_job(E_Comp *c)
}
}
}
- else if (layout && evas_object_visible_get(o) &&
(!evas_object_pass_events_get(o)))
+ else if (layout && evas_object_visible_get(o) &&
(!evas_object_pass_events_get(o)) && (!evas_object_repeat_events_get(o)))
{
E_Comp_Win *cw;
--
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
