Skip to content
Snippets Groups Projects
Commit ae97eae2 authored by Deucе's avatar Deucе :ok_hand_tone4:
Browse files

Spell SDL_WINDOW_FULLSCREEN correctly.

Also, there's SDL_WINDOW_FULLSCREEN_DESKTOP, so or that in even
though we don't need to due to how it's defined.
parent 44e13868
No related branches found
No related tags found
No related merge requests found
Pipeline #6852 failed
...@@ -704,7 +704,7 @@ static void sdl_add_key(unsigned int keyval, struct video_stats *vs) ...@@ -704,7 +704,7 @@ static void sdl_add_key(unsigned int keyval, struct video_stats *vs)
if (keyval == 0xe0) if (keyval == 0xe0)
keyval = CIO_KEY_LITERAL_E0; keyval = CIO_KEY_LITERAL_E0;
if(keyval==0xa600 && vs != NULL) { if(keyval==0xa600 && vs != NULL) {
fullscreen = !(sdl.GetWindowFlags(win) & SDL_WINDOW_MAXIMIZED); fullscreen = !(sdl.GetWindowFlags(win) & (SDL_WINDOW_FULLSCREEN | SDL_WINDOW_FULLSCREEN_DESKTOP));
cio_api.mode=fullscreen?CIOLIB_MODE_SDL_FULLSCREEN:CIOLIB_MODE_SDL; cio_api.mode=fullscreen?CIOLIB_MODE_SDL_FULLSCREEN:CIOLIB_MODE_SDL;
update_cvstat(vs); update_cvstat(vs);
sdl.SetWindowFullscreen(win, fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0); sdl.SetWindowFullscreen(win, fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);
...@@ -1053,8 +1053,8 @@ void sdl_video_event_thread(void *data) ...@@ -1053,8 +1053,8 @@ void sdl_video_event_thread(void *data)
// SDL2: User resized window // SDL2: User resized window
case SDL_WINDOWEVENT_RESIZED: { case SDL_WINDOWEVENT_RESIZED: {
int flags = sdl.GetWindowFlags(win); int flags = sdl.GetWindowFlags(win);
fullscreen = (flags & (SDL_WINDOW_FULLSCREEN)) != 0; fullscreen = (flags & (SDL_WINDOW_FULLSCREEN | SDL_WINDOW_FULLSCREEN_DESKTOP)) != 0;
sdl.SetWindowResizable(win, (flags & SDL_WINDOW_FULLSCREEN) ? SDL_FALSE : SDL_TRUE); sdl.SetWindowResizable(win, (flags & (SDL_WINDOW_FULLSCREEN | SDL_WINDOW_FULLSCREEN_DESKTOP)) ? SDL_FALSE : SDL_TRUE);
cio_api.mode=fullscreen?CIOLIB_MODE_SDL_FULLSCREEN:CIOLIB_MODE_SDL; cio_api.mode=fullscreen?CIOLIB_MODE_SDL_FULLSCREEN:CIOLIB_MODE_SDL;
pthread_mutex_lock(&sdl_mode_mutex); pthread_mutex_lock(&sdl_mode_mutex);
if (sdl_mode) { if (sdl_mode) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment