ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-05-01 08:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Remove unnecessary function parameter

Browse source 
SetFullscreen() is never called in a case where the commit parameter is false anymore, so the parameter is unnecessary.
This commit is contained in:
Frank Praznik 2022-09-06 13:19:23 -04:00 committed by Sam Lantinga
parent 69e4c770f3
commit 78f843f741
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/video/wayland/SDL_waylandwindow.c
View file

@ -385,7 +385,7 @@ SetMinMaxDimensions(SDL_Window *window, SDL_bool commit)
} }
static void static void
SetFullscreen(SDL_Window *window, struct wl_output *output, SDL_bool commit) SetFullscreen(SDL_Window *window, struct wl_output *output)
{ {
SDL_WindowData *wind = window->driverdata; SDL_WindowData *wind = window->driverdata;
SDL_VideoData *viddata = wind->waylandData; SDL_VideoData *viddata = wind->waylandData;
@ -393,9 +393,7 @@ SetFullscreen(SDL_Window *window, struct wl_output *output, SDL_bool commit)
/* Pop-ups don't get to be fullscreened */ /* Pop-ups don't get to be fullscreened */
if (WINDOW_IS_XDG_POPUP(window)) { if (WINDOW_IS_XDG_POPUP(window)) {
/* ... but we still want to commit, particularly for ShowWindow */ /* ... but we still want to commit, particularly for ShowWindow */
if (commit) {
wl_surface_commit(wind->surface); wl_surface_commit(wind->surface);
}
return; return;
} }
@ -416,7 +414,7 @@ SetFullscreen(SDL_Window *window, struct wl_output *output, SDL_bool commit)
*/ */
libdecor_frame_set_capabilities(wind->shell_surface.libdecor.frame, LIBDECOR_ACTION_RESIZE); libdecor_frame_set_capabilities(wind->shell_surface.libdecor.frame, LIBDECOR_ACTION_RESIZE);
wl_surface_commit(wind->surface); wl_surface_commit(wind->surface);
} else if (commit) { } else {
struct libdecor_state *state = libdecor_state_new(GetWindowWidth(window), GetWindowHeight(window)); struct libdecor_state *state = libdecor_state_new(GetWindowWidth(window), GetWindowHeight(window));
libdecor_frame_commit(wind->shell_surface.libdecor.frame, state, NULL); libdecor_frame_commit(wind->shell_surface.libdecor.frame, state, NULL);
libdecor_state_free(state); libdecor_state_free(state);
@ -431,7 +429,7 @@ SetFullscreen(SDL_Window *window, struct wl_output *output, SDL_bool commit)
/* restore previous RESIZE capability */ /* restore previous RESIZE capability */
libdecor_frame_unset_capabilities(wind->shell_surface.libdecor.frame, LIBDECOR_ACTION_RESIZE); libdecor_frame_unset_capabilities(wind->shell_surface.libdecor.frame, LIBDECOR_ACTION_RESIZE);
wl_surface_commit(wind->surface); wl_surface_commit(wind->surface);
} else if (commit) { } else {
struct libdecor_state *state = libdecor_state_new(GetWindowWidth(window), GetWindowHeight(window)); struct libdecor_state *state = libdecor_state_new(GetWindowWidth(window), GetWindowHeight(window));
libdecor_frame_commit(wind->shell_surface.libdecor.frame, state, NULL); libdecor_frame_commit(wind->shell_surface.libdecor.frame, state, NULL);
libdecor_state_free(state); libdecor_state_free(state);
@ -444,9 +442,9 @@ SetFullscreen(SDL_Window *window, struct wl_output *output, SDL_bool commit)
if (wind->shell_surface.xdg.roleobj.toplevel == NULL) { if (wind->shell_surface.xdg.roleobj.toplevel == NULL) {
return; /* Can't do anything yet, wait for ShowWindow */ return; /* Can't do anything yet, wait for ShowWindow */
} }
if (commit) {
wl_surface_commit(wind->surface); wl_surface_commit(wind->surface);
}
if (output) { if (output) {
xdg_toplevel_set_fullscreen(wind->shell_surface.xdg.roleobj.toplevel, output); xdg_toplevel_set_fullscreen(wind->shell_surface.xdg.roleobj.toplevel, output);
} else { } else {
@ -1755,7 +1753,7 @@ Wayland_SetWindowFullscreen(_THIS, SDL_Window * window,
/* Don't send redundant fullscreen set/unset events. */ /* Don't send redundant fullscreen set/unset events. */
if (wind->is_fullscreen != fullscreen) { if (wind->is_fullscreen != fullscreen) {
wind->is_fullscreen = fullscreen; wind->is_fullscreen = fullscreen;
SetFullscreen(window, fullscreen ? output : NULL, SDL_TRUE); SetFullscreen(window, fullscreen ? output : NULL);
/* Roundtrip required to receive the updated window dimensions */ /* Roundtrip required to receive the updated window dimensions */
WAYLAND_wl_display_roundtrip(viddata->display); WAYLAND_wl_display_roundtrip(viddata->display);