summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2014-12-05 12:49:42 -0500
committerChris Michael <cp.michael@samsung.com>2014-12-05 13:03:52 -0500
commitfc11f421d91af9d36e0a4488e5055735fe57d75a (patch)
treec1287ad34c4504b6db1a5c2c78d7ab1da01d1fca
parent45eaeee5ea12d31f9e47225f9677290a7876ebf1 (diff)
ecore-evas-wayland: Fix issue with ELM_PROFILE=mobile and windows not
showing up correctly. Summary: If elm config profile is set to Mobile, then the auto_norender_withdrawn is set to 1, which was causing Elm windows to not draw properly due to the ee->withdrawn property not being updated. It was not getting updated due to these checks for override. NB: Tested this with all elm profiles, tested in weston, and tested in Enlightenment (Wayland). @fix Signed-off-by: Chris Michael <cp.michael@samsung.com>
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c7
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c7
2 files changed, 4 insertions, 10 deletions
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index c8b566bf08..e6b78189ad 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
@@ -331,11 +331,8 @@ _ecore_evas_wl_show(Ecore_Evas *ee)
331 evas_object_resize(wdata->frame, ee->w + fw, ee->h + fh); 331 evas_object_resize(wdata->frame, ee->w + fw, ee->h + fh);
332 } 332 }
333 333
334 if (ee->prop.override) 334 ee->prop.withdrawn = EINA_FALSE;
335 { 335 if (ee->func.fn_state_change) ee->func.fn_state_change(ee);
336 ee->prop.withdrawn = EINA_FALSE;
337 if (ee->func.fn_state_change) ee->func.fn_state_change(ee);
338 }
339 336
340 if (ee->visible) return; 337 if (ee->visible) return;
341 ee->visible = 1; 338 ee->visible = 1;
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
index 09bf26e128..09c56160fc 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
@@ -323,11 +323,8 @@ _ecore_evas_wl_show(Ecore_Evas *ee)
323 evas_object_resize(wdata->frame, ee->w + fw, ee->h + fh); 323 evas_object_resize(wdata->frame, ee->w + fw, ee->h + fh);
324 } 324 }
325 325
326 if (ee->prop.override) 326 ee->prop.withdrawn = EINA_FALSE;
327 { 327 if (ee->func.fn_state_change) ee->func.fn_state_change(ee);
328 ee->prop.withdrawn = EINA_FALSE;
329 if (ee->func.fn_state_change) ee->func.fn_state_change(ee);
330 }
331 328
332 if (ee->visible) return; 329 if (ee->visible) return;
333 ee->visible = 1; 330 ee->visible = 1;