(svn r7955) -Backport from trunk (r7886): 0.5
authorDarkvater
Sun, 07 Jan 2007 12:19:08 +0000
branch0.5
changeset 5398 c9220fc54c8d
parent 5397 84c3230b3411
child 5399 1bd8a20f6257
(svn r7955) -Backport from trunk (r7886):
- [osx] control+enter no longer fullscreens, interfered with team-chat.
video/cocoa_v.m
--- a/video/cocoa_v.m	Sun Jan 07 12:18:05 2007 +0000
+++ b/video/cocoa_v.m	Sun Jan 07 12:19:08 2007 +0000
@@ -337,10 +337,7 @@
 
 		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;