mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-02-13 15:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

emscripten: Prevent fullscreen transitions while one is already in progress.

Browse Source 
Fixes #14533.
This commit is contained in:
Ryan C. Gordon
2025-12-01 23:33:30 -05:00
parent 6d99204a82
commit 737be31c63
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/emscripten/SDL_emscriptenevents.c
View File

@@ -480,6 +480,8 @@ static EM_BOOL Emscripten_HandleFullscreenChange(int eventType, const Emscripten
{
SDL_WindowData *window_data = userData;
window_data->fullscreen_change_in_progress = false;
if (fullscreenChangeEvent->isFullscreen) {
SDL_SendWindowEvent(window_data->window, SDL_EVENT_WINDOW_ENTER_FULLSCREEN, 0, 0);
window_data->fullscreen_mode_flags = 0;

13
src/video/emscripten/SDL_emscriptenvideo.c
View File

@@ -674,6 +674,17 @@ static SDL_FullscreenResult Emscripten_SetWindowFullscreen(SDL_VideoDevice *_thi
if (window->internal) {
data = window->internal;
if (data->fullscreen_change_in_progress) {
return SDL_FULLSCREEN_FAILED;;
}
EmscriptenFullscreenChangeEvent fsevent;
if (emscripten_get_fullscreen_status(&fsevent) == EMSCRIPTEN_RESULT_SUCCESS) {
if ((fullscreen == SDL_FULLSCREEN_OP_ENTER) == fsevent.isFullscreen) {
return SDL_FULLSCREEN_SUCCEEDED; // already there.
}
}
if (fullscreen) {
EmscriptenFullscreenStrategy strategy;
bool is_fullscreen_desktop = !window->fullscreen_exclusive;
@@ -704,8 +715,10 @@ static SDL_FullscreenResult Emscripten_SetWindowFullscreen(SDL_VideoDevice *_thi
}
if (res == EMSCRIPTEN_RESULT_SUCCESS) {
data->fullscreen_change_in_progress = true; // even on success, this might animate to the new state.
return SDL_FULLSCREEN_SUCCEEDED;
} else if (res == EMSCRIPTEN_RESULT_DEFERRED) {
data->fullscreen_change_in_progress = true;
return SDL_FULLSCREEN_PENDING;
} else {
return SDL_FULLSCREEN_FAILED;

1
src/video/emscripten/SDL_emscriptenvideo.h
View File

@@ -46,6 +46,7 @@ struct SDL_WindowData
Uint32 fullscreen_mode_flags;
bool fullscreen_resize;
bool fullscreen_change_in_progress;
bool has_pointer_lock;