Commit 3cc27bce authored by David Fuhrmann's avatar David Fuhrmann

macosx: same action for show playlist menu item and playlist button

Previous code recognized the alt value in Cmd+alt+p as an alt value,
even if the user does not really want to hide the window contents when using
the shortcut.
parent bea839c1
...@@ -472,12 +472,16 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -472,12 +472,16 @@ static VLCMainWindow *_o_sharedInstance = nil;
if (b_nativeFullscreenMode && b_fullscreen && b_activeVideo && sender != nil) if (b_nativeFullscreenMode && b_fullscreen && b_activeVideo && sender != nil)
return; return;
if (b_dropzone_active && ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0) { BOOL b_have_alt_key = ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0;
if (sender && [sender isKindOfClass: [NSMenuItem class]])
b_have_alt_key = NO;
if (b_dropzone_active && b_have_alt_key) {
[self hideDropZone]; [self hideDropZone];
return; return;
} }
if (!(b_nativeFullscreenMode && b_fullscreen) && !b_splitview_removed && ((([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0 && b_activeVideo) if (!(b_nativeFullscreenMode && b_fullscreen) && !b_splitview_removed && ((b_have_alt_key && b_activeVideo)
|| (b_nonembedded && sender != nil) || (b_nonembedded && sender != nil)
|| (!b_activeVideo && sender != nil) || (!b_activeVideo && sender != nil)
|| b_minimized_view)) || b_minimized_view))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment