From 5e84f194e6a12bd066f4df5f441d58572a1a61d0 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Wed, 15 Aug 2012 10:02:22 +0000 Subject: [PATCH] Ecore_Wayland: Only set the window allocated size if it is not a fullscreen window. On a configure event, do not reset the allocated size (this will be calculated and set later). SVN revision: 75292 --- .../ecore/src/lib/ecore_wayland/ecore_wl_window.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_window.c b/legacy/ecore/src/lib/ecore_wayland/ecore_wl_window.c index 74514a2847..76524acd07 100644 --- a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_window.c +++ b/legacy/ecore/src/lib/ecore_wayland/ecore_wl_window.c @@ -205,11 +205,11 @@ ecore_wl_window_resize(Ecore_Wl_Window *win, int w, int h, int location) if (!win) return; - win->allocation.w = w; - win->allocation.h = h; - if (win->type != ECORE_WL_WINDOW_TYPE_FULLSCREEN) { + win->allocation.w = w; + win->allocation.h = h; + win->region.input = wl_compositor_create_region(_ecore_wl_disp->wl.compositor); wl_region_add(win->region.input, win->allocation.x, win->allocation.y, @@ -471,9 +471,8 @@ ecore_wl_window_fullscreen_set(Ecore_Wl_Window *win, Eina_Bool fullscreen) if (win->shell_surface) wl_shell_surface_set_toplevel(win->shell_surface); win->type = ECORE_WL_WINDOW_TYPE_TOPLEVEL; - win->allocation = win->saved_allocation; - _ecore_wl_window_configure_send(win, win->allocation.w, - win->allocation.h); + _ecore_wl_window_configure_send(win, win->saved_allocation.w, + win->saved_allocation.h); } } @@ -621,9 +620,6 @@ _ecore_wl_window_cb_configure(void *data, struct wl_shell_surface *shell_surface if ((win->allocation.w != w) || (win->allocation.h != h)) { - win->allocation.w = w; - win->allocation.h = h; - win->edges = edges; if (win->region.input) wl_region_destroy(win->region.input); win->region.input = NULL;