git.videolan.org
/
vlc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9a81442
)
* fixed a bug which prevented the fspanel to show up in some circumstances. Patch...
author
Felix Paul Kühne
<fkuehne@videolan.org>
Sat, 10 Feb 2007 17:47:50 +0000
(17:47 +0000)
committer
Felix Paul Kühne
<fkuehne@videolan.org>
Sat, 10 Feb 2007 17:47:50 +0000
(17:47 +0000)
modules/gui/macosx/misc.m
patch
|
blob
|
history
diff --git
a/modules/gui/macosx/misc.m
b/modules/gui/macosx/misc.m
index
d92d5a0
..
1ecc4ef
100644
(file)
--- 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];
}