usergreen
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Pull Requests Activity

ecore-evas-wl: Fix ecore-evas wl common code due to botched rebase 

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2015-10-13 13:01:52 -04:00
parent da2990b414
commit f444bf45f5
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
View File

@ -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);