From 1b4defbae9f71624e12571ae6cd10078f1efcec2 Mon Sep 17 00:00:00 2001
From: Kaavya Ramachandhran <60326357+ayvaak@users.noreply.github.com>
Date: Tue, 23 Apr 2024 17:20:16 -0400
Subject: [PATCH] Fix #21696: Fullscreen window option not correctly applied on
 macOS

---
 distribution/changelog.txt    | 1 +
 src/openrct2-ui/UiContext.cpp | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/distribution/changelog.txt b/distribution/changelog.txt
index 205bf92d98..c2b58aa2ba 100644
--- a/distribution/changelog.txt
+++ b/distribution/changelog.txt
@@ -5,6 +5,7 @@
 - Improved: [#21769] Expose “animation is backwards” wall property in Tile Inspector.
 - Change: [#21715] [Plugin] Remove access to the internal `owner` property. Note: `ownership` is still accessible.
 - Fix: [#866] Boat Hire boats get stuck entering track.
+- Fix: [#21696] Fullscreen window option not correctly applied on macOS.
 - Fix: [#21787] Map generator heightmap should respect increased height limits.
 - Fix: [#21829] When creating a new scenario, the default name contains formatting codes.
 
diff --git a/src/openrct2-ui/UiContext.cpp b/src/openrct2-ui/UiContext.cpp
index 26a1461289..40ebaf3d06 100644
--- a/src/openrct2-ui/UiContext.cpp
+++ b/src/openrct2-ui/UiContext.cpp
@@ -762,12 +762,7 @@ private:
 
         UpdateFullscreenResolutions();
 
-        // Fix #4022: Force Mac to windowed to avoid cursor offset on launch issue
-#ifdef __MACOSX__
-        gConfigGeneral.FullscreenMode = static_cast<int32_t>(OpenRCT2::Ui::FULLSCREEN_MODE::WINDOWED);
-#else
         SetFullscreenMode(static_cast<FULLSCREEN_MODE>(gConfigGeneral.FullscreenMode));
-#endif
         TriggerResize();
     }