summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-11-02 13:50:13 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-11-02 13:50:13 +0900
commitc4f54e23e617b758110abc2cd91569a32aa2126a (patch)
tree83a595a757bab964022624dbbf11338356d4d6cf /src/lib
parent298f4af7fa324ae78822329b755ee06f6d127a86 (diff)
fix framespace handling in evas _render to not cause in/out events...
but this is not finished. this needs proper fixing. this is a quick patch for just the worst. the real solution is discussed here: https://phab.enlightenment.org/T457
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/evas/canvas/evas_render.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index 3b14c28bda..7e0b16b6e8 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -1661,6 +1661,7 @@ evas_render_updates_internal(Evas *eo_e,
1661 1661
1662 if (!strncmp(e->engine.module->definition->name, "wayland", 7)) 1662 if (!strncmp(e->engine.module->definition->name, "wayland", 7))
1663 { 1663 {
1664 evas_event_freeze(eo_e);
1664 /* check for master clip */ 1665 /* check for master clip */
1665 if (!e->framespace.clip) 1666 if (!e->framespace.clip)
1666 { 1667 {
@@ -1670,6 +1671,8 @@ evas_render_updates_internal(Evas *eo_e,
1670 evas_object_resize(e->framespace.clip, 1671 evas_object_resize(e->framespace.clip,
1671 e->viewport.w - e->framespace.w, 1672 e->viewport.w - e->framespace.w,
1672 e->viewport.h - e->framespace.h); 1673 e->viewport.h - e->framespace.h);
1674 evas_object_pass_events_set(e->framespace.clip, EINA_TRUE);
1675 evas_object_layer_set(e->framespace.clip, EVAS_LAYER_MIN);
1673 evas_object_show(e->framespace.clip); 1676 evas_object_show(e->framespace.clip);
1674 } 1677 }
1675 1678
@@ -1702,6 +1705,9 @@ evas_render_updates_internal(Evas *eo_e,
1702 evas_object_clip_set(obj->object, e->framespace.clip); 1705 evas_object_clip_set(obj->object, e->framespace.clip);
1703 } 1706 }
1704 } 1707 }
1708 if (!evas_object_clipees_get(e->framespace.clip))
1709 evas_object_hide(e->framespace.clip);
1710 evas_event_thaw(eo_e);
1705 } 1711 }
1706 1712
1707 /* phase 1.5. check if the video should be inlined or stay in their overlay */ 1713 /* phase 1.5. check if the video should be inlined or stay in their overlay */