Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ship-side part of the Mac fullscreen fix #5060

Open
wants to merge 15 commits into
base: develop
Choose a base branch
from
Open

Ship-side part of the Mac fullscreen fix #5060

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
124687a
update
larsy1995 Dec 18, 2024
188abbb
Revert "update"
larsy1995 Dec 18, 2024
90f999c
Merge remote-tracking branch 'upstream/develop' into develop
larsy1995 Jan 27, 2025
9a26565
Merge remote-tracking branch 'upstream/develop' into develop
larsy1995 Jan 27, 2025
b652514
Merge remote-tracking branch 'upstream/develop' into develop
larsy1995 Feb 3, 2025
8e8ca19
Update libultraship
larsy1995 Feb 6, 2025
96faafc
Update libultraship
larsy1995 Feb 6, 2025
68b7182
Update libultraship
larsy1995 Feb 6, 2025
6a4edf5
LUS Bump + Windowed -> Exclusive
larsy1995 Feb 8, 2025
6ddbf67
Merge remote-tracking branch 'upstream/develop' into develop
larsy1995 Feb 8, 2025
3f58fb6
Update libultraship
larsy1995 Feb 13, 2025
ed68cf0
Merge remote-tracking branch 'upstream/develop' into develop
larsy1995 Feb 13, 2025
96497e8
Here're the full changes for the fullscreen fix
larsy1995 Feb 13, 2025
d77dfb9
Re-added a line
larsy1995 Feb 13, 2025
7168e4f
Without spaces this time
larsy1995 Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions soh/soh/SohGui/SohMenuBar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,8 +515,13 @@ void DrawSettingsMenu() {
UIWidgets::Tooltip("Activate vertical sync, to prevent screen tearing.");
}

#ifdef __APPLE__
if (Ship::Context::GetInstance()->GetWindow()->SupportsWindowedFullscreen() && !Ship::Context::GetInstance()->GetWindow()->IsFullscreen()) {
UIWidgets::PaddedEnhancementCheckbox("Exclusive fullscreen", CVAR_SDL_WINDOWED_FULLSCREEN, true, false);
#else
if (Ship::Context::GetInstance()->GetWindow()->SupportsWindowedFullscreen()) {
UIWidgets::PaddedEnhancementCheckbox("Windowed fullscreen", CVAR_SDL_WINDOWED_FULLSCREEN, true, false);
#endif
}

if (Ship::Context::GetInstance()->GetWindow()->GetGui()->SupportsViewports()) {
Expand Down