orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ecore_Wayland: When we unmaximize windows, used the saved allocation 

sizes. When setting a window to be not transparent, recreate the
opaque region if needed.



SVN revision: 75004
This commit is contained in:
Christopher Michael 2012-08-08 10:06:12 +00:00
parent 46fdb76391
commit 33d4af1e18
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
legacy/ecore/src/lib/ecore_wayland/ecore_wl_window.c
View File

@ -431,6 +431,7 @@ ecore_wl_window_maximized_set(Ecore_Wl_Window *win, Eina_Bool maximized)
LOGFN(__FILE__, __LINE__, __FUNCTION__); LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!win) return; if (!win) return;
if ((win->type == ECORE_WL_WINDOW_TYPE_MAXIMIZED) == maximized) return; if ((win->type == ECORE_WL_WINDOW_TYPE_MAXIMIZED) == maximized) return;
if (win->type == ECORE_WL_WINDOW_TYPE_TOPLEVEL) if (win->type == ECORE_WL_WINDOW_TYPE_TOPLEVEL)
{ {
@ -439,14 +440,13 @@ ecore_wl_window_maximized_set(Ecore_Wl_Window *win, Eina_Bool maximized)
wl_shell_surface_set_maximized(win->shell_surface, NULL); wl_shell_surface_set_maximized(win->shell_surface, NULL);
win->type = ECORE_WL_WINDOW_TYPE_MAXIMIZED; win->type = ECORE_WL_WINDOW_TYPE_MAXIMIZED;
} }
else else if (win->type == ECORE_WL_WINDOW_TYPE_MAXIMIZED)
{ {
if (win->shell_surface) if (win->shell_surface)
wl_shell_surface_set_toplevel(win->shell_surface); wl_shell_surface_set_toplevel(win->shell_surface);
win->type = ECORE_WL_WINDOW_TYPE_TOPLEVEL; win->type = ECORE_WL_WINDOW_TYPE_TOPLEVEL;
win->allocation = win->saved_allocation; _ecore_wl_window_configure_send(win, win->saved_allocation.w,
_ecore_wl_window_configure_send(win, win->allocation.w, win->saved_allocation.h);
win->allocation.h);
} }
} }
@ -484,6 +484,15 @@ ecore_wl_window_transparent_set(Ecore_Wl_Window *win, Eina_Bool transparent)
if (!win) return; if (!win) return;
win->transparent = transparent; win->transparent = transparent;
if (win->region.opaque) wl_region_destroy(win->region.opaque);
win->region.opaque = NULL;
if (!win->transparent)
{
win->region.opaque =
wl_compositor_create_region(_ecore_wl_disp->wl.compositor);
wl_region_add(win->region.opaque, win->allocation.x, win->allocation.y,
win->allocation.w, win->allocation.h);
}
} }
EAPI void EAPI void
@ -612,6 +621,9 @@ _ecore_wl_window_cb_configure(void *data, struct wl_shell_surface *shell_surface
if ((win->allocation.w != w) || (win->allocation.h != h)) if ((win->allocation.w != w) || (win->allocation.h != h))
{ {
win->allocation.w = w;
win->allocation.h = h;
win->edges = edges; win->edges = edges;
if (win->region.input) wl_region_destroy(win->region.input); if (win->region.input) wl_region_destroy(win->region.input);
win->region.input = NULL; win->region.input = NULL;