From 856acc148267d68958d86743dd5afad2e00088f9 Mon Sep 17 00:00:00 2001 From: Wonki Kim Date: Wed, 27 Dec 2017 16:30:00 +0900 Subject: [PATCH] rebase/ecore_wl2: Modify ecore_wl2 window to follow upstream code Change-Id: Ia802987535084e09c0cfe3cb6776a9288a6be69e Signed-off-by: Wonki Kim --- src/lib/ecore_wl2/ecore_wl2_window.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c index b183500..f73a4bb 100644 --- a/src/lib/ecore_wl2/ecore_wl2_window.c +++ b/src/lib/ecore_wl2/ecore_wl2_window.c @@ -224,14 +224,15 @@ _zxdg_toplevel_cb_configure(void *data, struct zxdg_toplevel_v6 *zxdg_toplevel E } } - if ((!width) && (!height) && (!win->fullscreen) && (!win->maximized) && - ((win->fullscreen != fs) || (win->maximized != max))) + if ((!width) && (!height) && (!win->def_config.fullscreen) && (!win->def_config.maximized) && + ((win->def_config.fullscreen != win->set_config.fullscreen) || (win->def_config.maximized != win->set_config.maximized))) width = win->saved.w, height = win->saved.h; - _ecore_wl2_window_configure_send(win, width, height, !!win->resizing, - win->fullscreen, win->maximized); + _ecore_wl2_window_configure_send(win); + //, width, height, !!win->def_config.resizing, + // win->def_config.fullscreen, win->def_config.maximized); - if (win->focused) + if (win->def_config.focused) _ecore_wl2_window_activate_send(win); else _ecore_wl2_window_deactivate_send(win); -- 2.7.4