From bb00c9b588b4664f2920b37c13ecb8467d0eef1a Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sun, 31 Jan 2016 10:34:17 +0200 Subject: [PATCH 1/2] Added menu option to control fullscreen toggle shortcut on OS X --- wadsrc/static/menudef.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index add844455..2c04e492d 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -894,6 +894,10 @@ OptionMenu "MiscOptions" Option "Merge left+right Alt/Ctrl/Shift", "k_mergekeys", "OnOff" Option "Alt-Enter toggles fullscreen", "k_allowfullscreentoggle", "OnOff" } + IfOption(Mac) + { + Option "Command-F toggles fullscreen", "k_allowfullscreentoggle", "OnOff" + } Option "Show IWAD selection dialog", "queryiwad", "OnOff" StaticText " " Option "Enable cheats from all games", "allcheats", "OnOff" From 7b0f5575141ec89f4c30813bd165e83691545c96 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sun, 31 Jan 2016 10:42:16 +0200 Subject: [PATCH 2/2] Enabled zoom window button on OS X Independently from OS version the game will enter fullscreen mode when zoom button is clicked Window zooming behavior introduced in Yosemite is available on all supported versions of OS X --- src/posix/cocoa/i_video.mm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/posix/cocoa/i_video.mm b/src/posix/cocoa/i_video.mm index 1a535c088..2d10a9ccb 100644 --- a/src/posix/cocoa/i_video.mm +++ b/src/posix/cocoa/i_video.mm @@ -70,6 +70,27 @@ @end +@interface NSWindow(EnterFullscreenOnZoom) +- (void)enterFullscreenOnZoom; +@end + +@implementation NSWindow(EnterFullscreenOnZoom) + +- (void)enterFullscreen:(id)sender +{ + ToggleFullscreen = true; +} + +- (void)enterFullscreenOnZoom +{ + NSButton* zoomButton = [self standardWindowButton:NSWindowZoomButton]; + [zoomButton setEnabled:YES]; + [zoomButton setAction:@selector(enterFullscreen:)]; + [zoomButton setTarget:self]; +} + +@end + EXTERN_CVAR(Bool, ticker ) EXTERN_CVAR(Bool, vid_vsync) @@ -676,6 +697,7 @@ void CocoaVideo::SetWindowedMode(const int width, const int height) [m_window setContentSize:windowSize]; [m_window center]; + [m_window enterFullscreenOnZoom]; [m_window exitAppOnClose]; }