From b59de38e0bcbdebf9fd4fa51eb169d948e96c263 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sun, 9 Jun 2024 15:42:39 -0500 Subject: [PATCH] Revert "Only use SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES=0 for native notched resolution" Users want to control when the notch is and is not included for display scaling. Fixes #1301 This reverts commit e25d9b0da200154276fd0b8f44a0f7419420275f. --- app/streaming/session.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/streaming/session.cpp b/app/streaming/session.cpp index 968b1713..391164af 100644 --- a/app/streaming/session.cpp +++ b/app/streaming/session.cpp @@ -570,7 +570,7 @@ bool Session::initialize() // (notched or notchless), override the fullscreen mode to ensure it works as expected. // - SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES=0 will place the video underneath the notch // - SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES=1 will place the video below the notch - bool shouldUseFullScreenSpaces = true; + bool shouldUseFullScreenSpaces = m_Preferences->windowMode != StreamingPreferences::WM_FULLSCREEN; SDL_DisplayMode desktopMode; SDL_Rect safeArea; for (int displayIndex = 0; StreamUtils::getNativeDesktopMode(displayIndex, &desktopMode, &safeArea); displayIndex++) { @@ -583,6 +583,12 @@ bool Session::initialize() shouldUseFullScreenSpaces = false; break; } + else if (m_Preferences->width == safeArea.w && m_Preferences->height == safeArea.h) { + SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, + "Overriding default fullscreen mode for native safe area resolution"); + shouldUseFullScreenSpaces = true; + break; + } } }