From 6e5f6934592bcb50f030cda2e3b1628f33693054 Mon Sep 17 00:00:00 2001 From: Chandler Cox Date: Mon, 14 Aug 2023 18:25:19 -0500 Subject: [PATCH] Small change to allow other platforms to use fullscreen and windowed in WindowMode function --- Source/Engine/Engine/Screen.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Source/Engine/Engine/Screen.cpp b/Source/Engine/Engine/Screen.cpp index b4e35ca7a..cb2994129 100644 --- a/Source/Engine/Engine/Screen.cpp +++ b/Source/Engine/Engine/Screen.cpp @@ -137,20 +137,28 @@ void Screen::SetCursorLock(CursorLockMode mode) void Screen::SetGameWindowMode(GameWindowMode windowMode) { -#if (PLATFORM_WINDOWS) && !USE_EDITOR +#if !USE_EDITOR switch (windowMode) { case GameWindowMode::Windowed: + if (GetIsFullscreen()) + SetIsFullscreen(false); +#if (PLATFORM_WINDOWS) Engine::MainWindow->SetBorderless(false, false); +#endif break; case GameWindowMode::Fullscreen: SetIsFullscreen(true); break; case GameWindowMode::Borderless: +#if (PLATFORM_WINDOWS) Engine::MainWindow->SetBorderless(true, false); +#endif break; case GameWindowMode::FullscreenBorderless: +#if (PLATFORM_WINDOWS) Engine::MainWindow->SetBorderless(true, true); +#endif break; default: ; }