devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f444bf45f571d7a2624fa85b3c7daa60be32b7f3
commit f444bf45f571d7a2624fa85b3c7daa60be32b7f3
Author: Chris Michael <cp.mich...@samsung.com>
Date: Tue Oct 13 13:01:52 2015 -0400
ecore-evas-wl: Fix ecore-evas wl common code due to botched rebase
Signed-off-by: Chris Michael <cp.mich...@samsung.com>
---
.../ecore_evas/engines/wayland/ecore_evas_wayland_common.c | 8 +-------
1 file changed, 1 insertion(+), 7 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 45377f5..b922abb 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
@@ -161,6 +161,7 @@ _ecore_evas_wl_common_cb_focus_out(void *data EINA_UNUSED,
int type EINA_UNUSED,
return ECORE_CALLBACK_PASS_ON;
}
+<<<<<<< cdc9ff78e4db118ef9e2d70b7425ca9b46bdb2df
static Eina_Bool
_ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type
EINA_UNUSED, void *event)
{
@@ -226,7 +227,6 @@ _ecore_evas_wl_common_cb_window_configure(void *data
EINA_UNUSED, int type EINA_
Ecore_Evas_Engine_Wl_Data *wdata;
Ecore_Wl2_Event_Window_Configure *ev;
int nw = 0, nh = 0;
- int fw = 0, fh = 0;
Eina_Bool prev_max, prev_full;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -249,12 +249,6 @@ _ecore_evas_wl_common_cb_window_configure(void *data
EINA_UNUSED, int type EINA_
if (nw < 1) nw = 1;
if (nh < 1) nh = 1;
- if (ee->prop.fullscreen)
- {
- if ((nw <= 1) || (nh <= 1))
- evas_output_size_get(ee->evas, &nw, &nh);
- }
-
if (prev_full != ee->prop.fullscreen)
_ecore_evas_wl_common_border_update(ee);
--
