summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2007-01-05 19:50:44 +0000
committerbjarni <bjarni@openttd.org>2007-01-05 19:50:44 +0000
commitfd24669dee6638a01ac53a97216afcdfd08c4077 (patch)
treee7348dacc6c4666d8a5a9fa751d2629016371dac
parent566288adf0abad0c54ba07094fe1c6486281cde0 (diff)
downloadopenttd-fd24669dee6638a01ac53a97216afcdfd08c4077.tar.xz
(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)
-rw-r--r--src/video/cocoa_v.m5
1 files changed, 1 insertions, 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;