summaryrefslogtreecommitdiff
path: root/src/video/cocoa/cocoa_v.mm
diff options
context:
space:
mode:
authorMichael Lutz <michi@icosahedron.de>2021-01-03 22:14:03 +0100
committerMichael Lutz <michi@icosahedron.de>2021-01-03 22:24:04 +0100
commit979b4af6cae925e7426ab9e4b4c5bdc9084545fd (patch)
tree9e85b1855d43464edcc9d45e8937fca3eef34afe /src/video/cocoa/cocoa_v.mm
parent6e8be3b03ea9ed68f4d76f42256c9745e7088d02 (diff)
downloadopenttd-979b4af6cae925e7426ab9e4b4c5bdc9084545fd.tar.xz
Revert 4ce53cb8: [OSX] Delayed fullscreen switch is not needed anymore.
The fix for #8067 solves the real issue, making this workaround unneeded.
Diffstat (limited to 'src/video/cocoa/cocoa_v.mm')
-rw-r--r--src/video/cocoa/cocoa_v.mm4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm
index 81715ff92..eae1acbc9 100644
--- a/src/video/cocoa/cocoa_v.mm
+++ b/src/video/cocoa/cocoa_v.mm
@@ -156,6 +156,7 @@ static void QZ_UpdateVideoModes()
static CocoaSubdriver *QZ_CreateSubdriver(int width, int height, int bpp, bool fullscreen, bool fallback)
{
CocoaSubdriver *ret = QZ_CreateWindowQuartzSubdriver(width, height, bpp);
+ if (ret != nullptr && fullscreen) ret->ToggleFullscreen(fullscreen);
if (ret != nullptr) return ret;
if (!fallback) return nullptr;
@@ -209,9 +210,6 @@ const char *VideoDriver_Cocoa::Start(const StringList &parm)
return "The cocoa quartz subdriver only supports 8 and 32 bpp.";
}
- /* Defer fullscreen toggle until the main loop is running,
- * as otherwise a grey bar will be stuck on top of the window. */
- this->fullscreen_on_mainloop = _fullscreen;
_cocoa_subdriver = QZ_CreateSubdriver(width, height, bpp, _fullscreen, true);
if (_cocoa_subdriver == NULL) {
Stop();