From 7fffca945ecbc7e4b0fe5dd2c125eae2c575ba4a Mon Sep 17 00:00:00 2001 From: jp9000 Date: Tue, 17 Aug 2021 06:00:53 -0700 Subject: [PATCH] Revert "UI: Remove macOS-Default Full Screen Menu Item" This reverts commit cf445be44c6707e1e5cef0b5be8afeb03f74bb72. Did not mean to merge this. #4768 --- UI/obs-app.cpp | 4 ---- UI/platform-osx.mm | 7 ------- UI/platform.hpp | 1 - 3 files changed, 12 deletions(-) diff --git a/UI/obs-app.cpp b/UI/obs-app.cpp index fe4e05477..a8876a641 100644 --- a/UI/obs-app.cpp +++ b/UI/obs-app.cpp @@ -2674,10 +2674,6 @@ int main(int argc, char *argv[]) } #endif -#ifdef __APPLE__ - DisableFullScreenViewMenuItem(); -#endif - #ifdef _WIN32 obs_init_win32_crash_handler(); SetErrorMode(SEM_FAILCRITICALERRORS); diff --git a/UI/platform-osx.mm b/UI/platform-osx.mm index fe1fa2616..c558c7a00 100644 --- a/UI/platform-osx.mm +++ b/UI/platform-osx.mm @@ -235,13 +235,6 @@ void EnableOSXDockIcon(bool enable) NSApplicationActivationPolicyProhibited]; } -void DisableFullScreenViewMenuItem() -{ - [[NSUserDefaults standardUserDefaults] - setBool:NO - forKey:@"NSFullScreenMenuItemEverywhere"]; -} - /* * This custom NSApplication subclass makes the app compatible with CEF. Qt * also has an NSApplication subclass, but it doesn't conflict thanks to Qt diff --git a/UI/platform.hpp b/UI/platform.hpp index 080139547..7e7d47ed1 100644 --- a/UI/platform.hpp +++ b/UI/platform.hpp @@ -69,7 +69,6 @@ void EnableOSXDockIcon(bool enable); void InstallNSApplicationSubclass(); void disableColorSpaceConversion(QWidget *window); void CheckAppWithSameBundleID(bool &already_running); -void DisableFullScreenViewMenuItem(); #endif #ifdef __linux__ void RunningInstanceCheck(bool &already_running);