From 298d02c6f9a97e80384cfa65e69d7dfd0635765e Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Sat, 21 Jul 2018 17:32:54 +0200 Subject: [PATCH] Change the fullscreen mode with JS too But the fullscreen provided by the browser is not handled by the game. It must be forwarded in the native code in order to switch properly the fullscreen boolean. --- src/blupi.cxx | 6 +++--- src/event.cxx | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/blupi.cxx b/src/blupi.cxx index 1dbd201..a2b59b9 100644 --- a/src/blupi.cxx +++ b/src/blupi.cxx @@ -1030,9 +1030,9 @@ DoInit (int argc, char * argv[], bool & exit) g_pPixmap->ChangeSprite (SPRITE_WAIT); // g_updateThread = new std::thread (CheckForUpdates); - // if (zoom != g_zoom) - // g_pEvent->SetWindowSize (g_zoom); - // g_pEvent->SetFullScreen (g_bFullScreen); + if (zoom != g_zoom) + g_pEvent->SetWindowSize (g_zoom); + g_pEvent->SetFullScreen (g_bFullScreen); g_pEvent->ChangePhase (EV_PHASE_INTRO1); g_bTermInit = true; diff --git a/src/event.cxx b/src/event.cxx index 10e427e..9affbe6 100644 --- a/src/event.cxx +++ b/src/event.cxx @@ -37,6 +37,7 @@ #include "misc.h" #include "movie.h" #include "pixmap.h" +#include "platform.h" #include "progress.h" #include "sound.h" #include "text.h" @@ -1723,12 +1724,15 @@ CEvent::GetMousePos () void CEvent::SetFullScreen (bool bFullScreen, double prevScale) { + g_bFullScreen = bFullScreen; + + if (Platform::getType () == Platform::Type::JS) + return; + int x, y; SDL_GetMouseState (&x, &y); this->m_pPixmap->FromDisplayToGame (x, y, prevScale); - g_bFullScreen = bFullScreen; - int displayIndex = SDL_GetWindowDisplayIndex (g_window); #ifdef _WIN32 if (g_zoom == 2)