diff options
| author | Michael Lutz <michi@icosahedron.de> | 2021-01-03 22:14:03 +0100 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2021-01-03 22:24:04 +0100 |
| commit | 979b4af6cae925e7426ab9e4b4c5bdc9084545fd (patch) | |
| tree | 9e85b1855d43464edcc9d45e8937fca3eef34afe | |
| parent | 6e8be3b03ea9ed68f4d76f42256c9745e7088d02 (diff) | |
| download | openttd-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.
| -rw-r--r-- | src/video/cocoa/cocoa_v.h | 1 | ||||
| -rw-r--r-- | src/video/cocoa/cocoa_v.mm | 4 | ||||
| -rw-r--r-- | src/video/cocoa/event.mm | 6 |
3 files changed, 1 insertions, 10 deletions
diff --git a/src/video/cocoa/cocoa_v.h b/src/video/cocoa/cocoa_v.h index f3e484b01..f5d175640 100644 --- a/src/video/cocoa/cocoa_v.h +++ b/src/video/cocoa/cocoa_v.h @@ -18,7 +18,6 @@ extern bool _cocoa_video_started; class VideoDriver_Cocoa : public VideoDriver { private: - bool fullscreen_on_mainloop; ///< Switch to fullscreen once the main loop is running? Dimension orig_res; ///< Saved window size for non-fullscreen mode. public: 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(); diff --git a/src/video/cocoa/event.mm b/src/video/cocoa/event.mm index 642149858..8a43945f5 100644 --- a/src/video/cocoa/event.mm +++ b/src/video/cocoa/event.mm @@ -652,12 +652,6 @@ void VideoDriver_Cocoa::GameLoop() while (QZ_PollEvent()) {} - /* If we do that right after window creation, a grey bar will be left at the top. */ - if (this->fullscreen_on_mainloop) { - this->fullscreen_on_mainloop = false; - _cocoa_subdriver->ToggleFullscreen(true); - } - if (_exit_game) { /* Restore saved resolution if in fullscreen mode. */ if (_cocoa_subdriver->IsFullscreen()) _cur_resolution = this->orig_res; |