From fd24669dee6638a01ac53a97216afcdfd08c4077 Mon Sep 17 00:00:00 2001 From: bjarni Date: Fri, 5 Jan 2007 19:50:44 +0000 Subject: (svn r7886) -Fix: [OSX] control+enter will no longer toggle fullscreen as it collided with other hotkeys (pv2b) People should use command+enter as it was originally intended (this key combo also worked before this commit) --- src/video/cocoa_v.m | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/video/cocoa_v.m b/src/video/cocoa_v.m index f93f86ca4..8ea16315a 100644 --- a/src/video/cocoa_v.m +++ b/src/video/cocoa_v.m @@ -337,10 +337,7 @@ static void QZ_KeyEvent(unsigned short keycode, unsigned short unicode, BOOL dow case QZ_RETURN: case QZ_f: - if (down && ( - (_cocoa_video_data.current_mods & NSControlKeyMask) || - (_cocoa_video_data.current_mods & NSCommandKeyMask) - )) { + if (down && (_cocoa_video_data.current_mods & NSCommandKeyMask)) { CocoaVideoFullScreen(!_fullscreen); } break; -- cgit v1.2.3-70-g09d2