From 7da44adb9513478ddb19503e8e5c9064b688bba9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20Paul=20K=C3=BChne?= Date: Sat, 10 Feb 2007 17:47:50 +0000 Subject: [PATCH] * fixed a bug which prevented the fspanel to show up in some circumstances. Patch by Pierre d'Herbemont pdherbemont --at,- free.fr. This commit priortises Cocoa hotkeys instead of VLC's natives which is a good idea IMO. --- modules/gui/macosx/misc.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/gui/macosx/misc.m b/modules/gui/macosx/misc.m index d92d5a02f4..1ecc4efdf0 100644 --- a/modules/gui/macosx/misc.m +++ b/modules/gui/macosx/misc.m @@ -47,6 +47,11 @@ - (BOOL)performKeyEquivalent:(NSEvent *)o_event { + /* We indeed want to prioritize Cocoa key equivalent against libvlc, + so we perform the menu equivalent now. */ + if([[NSApp mainMenu] performKeyEquivalent:o_event]) + return TRUE; + return [[VLCMain sharedInstance] hasDefinedShortcutKey:o_event] || [(VLCControls *)[[VLCMain sharedInstance] getControls] keyEvent:o_event]; } -- 2.39.2