mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

desktop-shell: Set fullscreen flags in common code path

Browse Source 
Just as for set_maximized() we can move the setting of the fullscreen and
state_changed flags into the common set_fullscreen() function.  This
function is also used from the xwayland wm to set fullscreen windows, and
with this change that now works again.
This commit is contained in:
Kristian Høgsberg
2013-12-05 22:04:42 -08:00
parent c2745b14f0
commit e960b3f012
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop-shell/shell.c
+3 -6
View File
@@ -2184,6 +2184,8 @@ set_fullscreen(struct shell_surface *shsurf,
shsurf->fullscreen.type = method; shsurf->fullscreen.type = method;
shsurf->fullscreen.framerate = framerate; shsurf->fullscreen.framerate = framerate;
shsurf->next_state.fullscreen = true;
shsurf->state_changed = true;
shsurf->next_type = SHELL_SURFACE_TOPLEVEL; shsurf->next_type = SHELL_SURFACE_TOPLEVEL;
shsurf->client->send_configure(shsurf->surface, 0, shsurf->client->send_configure(shsurf->surface, 0,
@@ -2243,8 +2245,6 @@ shell_surface_set_fullscreen(struct wl_client *client,
shell_surface_set_parent(shsurf, NULL); shell_surface_set_parent(shsurf, NULL);
surface_clear_next_states(shsurf); surface_clear_next_states(shsurf);
shsurf->next_state.fullscreen = true;
shsurf->state_changed = true;
set_fullscreen(shsurf, method, framerate, output); set_fullscreen(shsurf, method, framerate, output);
} }
@@ -3122,13 +3122,10 @@ xdg_surface_set_fullscreen(struct wl_client *client,
if (shsurf->type != SHELL_SURFACE_TOPLEVEL) if (shsurf->type != SHELL_SURFACE_TOPLEVEL)
return; return;
if (!shsurf->next_state.fullscreen) { if (!shsurf->next_state.fullscreen)
shsurf->next_state.fullscreen = true;
shsurf->state_changed = true;
set_fullscreen(shsurf, set_fullscreen(shsurf,
WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT, WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT,
0, shsurf->recommended_output); 0, shsurf->recommended_output);
}
} }
static void static void