summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2017-03-08 12:45:07 -0600
committerDerek Foreman <derekf@osg.samsung.com>2017-03-09 12:21:08 -0600
commita1b90cf4d72961c62cfbb42d6f9b68cdb5490241 (patch)
tree3e372dd90d7b280388a67459034ce532d226fbf3
parentad1e5ead4037d59a19738d750514f6fafcdeaa5b (diff)
Revert "ecore-evas-wayland: Fix issue of apps not starting up in fullscreen mode"
This reverts commit dfb18775002c5130b60bdc03ed60b7de356e6012. This did fix the problem of "rage -f" not starting properly, but it broke toggling between fullscreen and !fullscreen for other apps. They'd resize to a large, but not quite fullscreen, size, then render with decor present, and big black bars on the right/bottom edges (which were offscreen due to the client size and position) This isn't really the right place to fix this - it's a protocol usage bug, not a canvas bug.
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c15
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h1
2 files changed, 0 insertions, 16 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 f7f6151fc0..53e1c89c22 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
@@ -1419,14 +1419,6 @@ _ecore_evas_wl_common_fullscreen_set(Ecore_Evas *ee, Eina_Bool on)
1419 if (ee->prop.fullscreen == on) return; 1419 if (ee->prop.fullscreen == on) return;
1420 1420
1421 wdata = ee->engine.data; 1421 wdata = ee->engine.data;
1422
1423 ee->prop.fullscreen = on;
1424 if ((!wdata->sync_done) || (!ee->visible))
1425 {
1426 wdata->defer_fullscreen = EINA_TRUE;
1427 return;
1428 }
1429
1430 ecore_wl2_window_fullscreen_set(wdata->win, on); 1422 ecore_wl2_window_fullscreen_set(wdata->win, on);
1431} 1423}
1432 1424
@@ -1806,13 +1798,6 @@ _ecore_evas_wl_common_show(Ecore_Evas *ee)
1806 1798
1807 ecore_wl2_window_show(wdata->win); 1799 ecore_wl2_window_show(wdata->win);
1808 ecore_wl2_window_alpha_set(wdata->win, ee->alpha); 1800 ecore_wl2_window_alpha_set(wdata->win, ee->alpha);
1809 ecore_wl2_window_transparent_set(wdata->win, ee->transparent);
1810
1811 if (wdata->defer_fullscreen)
1812 {
1813 wdata->defer_fullscreen = EINA_FALSE;
1814 ecore_wl2_window_fullscreen_set(wdata->win, ee->prop.fullscreen);
1815 }
1816 1801
1817 einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas); 1802 einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas);
1818 if (einfo) 1803 if (einfo)
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
index 2f98dcf1ab..e2a7840c66 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
@@ -50,7 +50,6 @@ struct _Ecore_Evas_Engine_Wl_Data
50 Eina_Bool sync_done : 1; 50 Eina_Bool sync_done : 1;
51 Eina_Bool defer_show : 1; 51 Eina_Bool defer_show : 1;
52 Eina_Bool reset_pending : 1; 52 Eina_Bool reset_pending : 1;
53 Eina_Bool defer_fullscreen : 1;
54}; 53};
55 54
56Ecore_Evas_Interface_Wayland *_ecore_evas_wl_interface_new(void); 55Ecore_Evas_Interface_Wayland *_ecore_evas_wl_interface_new(void);