enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

ecore-wayland: rewrite maximize/fullscreen set functions for consistency 

* use safety macros for win struct param (should be the case for all fns here)
* sanitize bool params
* enforce window state flag setting
* correctly detect window state using window flag instead of type

@fix

ref T2841
This commit is contained in:
Mike Blumenkrantz 2015-11-17 18:24:09 -05:00
parent 3b480804fc
commit ab3ab4feaa
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/lib/ecore_wayland/ecore_wl_window.c
View File

@ -447,40 +447,34 @@ ecore_wl_window_raise(Ecore_Wl_Window *win)
EAPI void
ecore_wl_window_maximized_set(Ecore_Wl_Window *win, Eina_Bool maximized)
{
Eina_Bool prev;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!win) return;
EINA_SAFETY_ON_NULL_RETURN(win);
prev = ecore_wl_window_maximized_get(win);
if ((win->type == ECORE_WL_WINDOW_TYPE_MAXIMIZED) == maximized) return;
maximized = !!maximized;
if (win->type == ECORE_WL_WINDOW_TYPE_TOPLEVEL)
if (prev == maximized) return;
if (maximized)
{
if (win->xdg_surface)
{
xdg_surface_set_maximized(win->xdg_surface);
win->type = ECORE_WL_WINDOW_TYPE_MAXIMIZED;
}
xdg_surface_set_maximized(win->xdg_surface);
else if (win->shell_surface)
{
wl_shell_surface_set_maximized(win->shell_surface, NULL);
win->type = ECORE_WL_WINDOW_TYPE_MAXIMIZED;
}
wl_shell_surface_set_maximized(win->shell_surface, NULL);
win->type = ECORE_WL_WINDOW_TYPE_MAXIMIZED;
}
else if (win->type == ECORE_WL_WINDOW_TYPE_MAXIMIZED)
else
{
if (win->xdg_surface)
{
xdg_surface_unset_maximized(win->xdg_surface);
win->type = ECORE_WL_WINDOW_TYPE_TOPLEVEL;
_ecore_wl_window_configure_send(win, win->saved.w, win->saved.h, 0);
}
xdg_surface_unset_maximized(win->xdg_surface);
else if (win->shell_surface)
{
wl_shell_surface_set_toplevel(win->shell_surface);
win->type = ECORE_WL_WINDOW_TYPE_TOPLEVEL;
_ecore_wl_window_configure_send(win, win->saved.w, win->saved.h, 0);
}
wl_shell_surface_set_toplevel(win->shell_surface);
win->type = ECORE_WL_WINDOW_TYPE_TOPLEVEL;
}
win->maximized = maximized;
}
EAPI Eina_Bool
@ -496,10 +490,17 @@ ecore_wl_window_maximized_get(Ecore_Wl_Window *win)
EAPI void
ecore_wl_window_fullscreen_set(Ecore_Wl_Window *win, Eina_Bool fullscreen)
{
Eina_Bool prev;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!win) return;
if ((win->type == ECORE_WL_WINDOW_TYPE_FULLSCREEN) == fullscreen) return;
EINA_SAFETY_ON_NULL_RETURN(win);
prev = ecore_wl_window_fullscreen_get(win);
fullscreen = !!fullscreen;
if (prev == fullscreen) return;
if (fullscreen)
{
win->type = ECORE_WL_WINDOW_TYPE_FULLSCREEN;
@ -520,8 +521,8 @@ ecore_wl_window_fullscreen_set(Ecore_Wl_Window *win, Eina_Bool fullscreen)
wl_shell_surface_set_toplevel(win->shell_surface);
win->type = ECORE_WL_WINDOW_TYPE_TOPLEVEL;
_ecore_wl_window_configure_send(win, win->saved.w, win->saved.h, 0);
}
win->fullscreen = fullscreen;
}
EAPI Eina_Bool