From 4dd19e400c9fd888825547714d5c9f1254aa6fa5 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 26 Oct 2023 07:54:46 +0300 Subject: [PATCH 39/39] sdl3: Drop use of SDL_WINDOW_FULLSCREEN_DESKTOP See osdn #48903 Signed-off-by: Marko Lindqvist --- client/gui-sdl3/graphics.c | 3 +-- client/gui-sdl3/gui_main.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/client/gui-sdl3/graphics.c b/client/gui-sdl3/graphics.c index ecdabdb9e2..aa49feaeab 100644 --- a/client/gui-sdl3/graphics.c +++ b/client/gui-sdl3/graphics.c @@ -624,8 +624,7 @@ bool set_video_mode(unsigned width, unsigned height, unsigned flags_in) if (flags_in & SDL_WINDOW_FULLSCREEN) { SDL_DisplayMode mode; - /* Use SDL_WINDOW_FULLSCREEN_DESKTOP instead of real SDL_WINDOW_FULLSCREEN */ - SDL_SetWindowFullscreen(main_data.screen, SDL_WINDOW_FULLSCREEN_DESKTOP); + SDL_SetWindowFullscreen(main_data.screen, SDL_WINDOW_FULLSCREEN); SDL_GetWindowDisplayMode(main_data.screen, &mode); width = mode.w; height = mode.h; diff --git a/client/gui-sdl3/gui_main.c b/client/gui-sdl3/gui_main.c index 4840f4874e..a231f108dd 100644 --- a/client/gui-sdl3/gui_main.c +++ b/client/gui-sdl3/gui_main.c @@ -930,7 +930,7 @@ static void fullscreen_callback(struct option *poption) SDL_DisplayMode mode; if (GUI_SDL_OPTION(fullscreen)) { - SDL_SetWindowFullscreen(main_data.screen, SDL_WINDOW_FULLSCREEN_DESKTOP); + SDL_SetWindowFullscreen(main_data.screen, SDL_WINDOW_FULLSCREEN); } else { SDL_SetWindowFullscreen(main_data.screen, 0); } @@ -940,7 +940,7 @@ static void fullscreen_callback(struct option *poption) if (!create_surfaces(mode.w, mode.h)) { /* Try to revert */ if (!GUI_SDL_OPTION(fullscreen)) { - SDL_SetWindowFullscreen(main_data.screen, SDL_WINDOW_FULLSCREEN_DESKTOP); + SDL_SetWindowFullscreen(main_data.screen, SDL_WINDOW_FULLSCREEN); } else { SDL_SetWindowFullscreen(main_data.screen, 0); } -- 2.42.0