summaryrefslogtreecommitdiff
path: root/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2017-02-27 11:08:43 -0500
committerChris Michael <cp.michael@samsung.com>2017-02-27 11:33:57 -0500
commit38f3854f45bcfca566feee882919d7a66f92ce13 (patch)
tree8e38d20f32ab2141c7a9a18dfa116257e10d25c4 /src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
parentfd77ff0d9238add0385a4e8fba2119c3e27b53b0 (diff)
ecore-evas-wayland: Don't register animators until window gets shown
Small patch to not call _ecore_evas_register unless we are showing the window. This stops creation of rogue animators on cursors until the window is actually going to be shown. Fixes T5209 @fix Signed-off-by: Chris Michael <cp.michael@samsung.com>
Diffstat (limited to 'src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c')
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 505a28331c..c68978f95b 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -1776,6 +1776,7 @@ _ecore_evas_wl_common_show(Ecore_Evas *ee)
1776 { 1776 {
1777 int fw, fh; 1777 int fw, fh;
1778 1778
1779 _ecore_evas_register(ee);
1779 evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh); 1780 evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
1780 1781
1781 ecore_wl2_window_show(wdata->win); 1782 ecore_wl2_window_show(wdata->win);
@@ -2008,6 +2009,8 @@ _ee_cb_sync_done(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
2008 2009
2009 wdata->defer_show = EINA_FALSE; 2010 wdata->defer_show = EINA_FALSE;
2010 2011
2012 _ecore_evas_register(ee);
2013
2011 ecore_wl2_window_show(wdata->win); 2014 ecore_wl2_window_show(wdata->win);
2012 ecore_wl2_window_alpha_set(wdata->win, ee->alpha); 2015 ecore_wl2_window_alpha_set(wdata->win, ee->alpha);
2013 ecore_wl2_window_transparent_set(wdata->win, ee->transparent); 2016 ecore_wl2_window_transparent_set(wdata->win, ee->transparent);
@@ -2260,7 +2263,6 @@ _ecore_evas_wl_common_new_internal(const char *disp_name, unsigned int parent, i
2260 2263
2261 ee->engine.func->fn_render = _ecore_evas_wl_common_render; 2264 ee->engine.func->fn_render = _ecore_evas_wl_common_render;
2262 2265
2263 _ecore_evas_register(ee);
2264 ecore_evas_input_event_register(ee); 2266 ecore_evas_input_event_register(ee);
2265 2267
2266 ecore_event_window_register(ee->prop.window, ee, ee->evas, 2268 ecore_event_window_register(ee->prop.window, ee, ee->evas,