Commit d74d16d1 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: allow to hide the drop zone while the playlist is empty using an...

macosx: allow to hide the drop zone while the playlist is empty using an option-click on the playlist toggle button (refs #6213)
(cherry picked from commit 51cbd1c24870eec1b386ee978d4ebcaae4a0ac9e)
parent 6d46730b
...@@ -643,6 +643,13 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -643,6 +643,13 @@ static VLCMainWindow *_o_sharedInstance = nil;
BOOL b_activeVideo = [[VLCMain sharedInstance] activeVideoPlayback]; BOOL b_activeVideo = [[VLCMain sharedInstance] activeVideoPlayback];
BOOL b_restored = NO; BOOL b_restored = NO;
if (b_dropzone_active && !b_activeVideo && ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0)
{
b_dropzone_active = NO;
[self hideDropZone];
return;
}
if ( !b_splitview_removed && ( (([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0 && b_activeVideo) if ( !b_splitview_removed && ( (([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0 && b_activeVideo)
|| (b_nonembedded && sender != nil) || (b_nonembedded && sender != nil)
|| (!b_activeVideo && sender != nil) || (!b_activeVideo && sender != nil)
...@@ -666,12 +673,6 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -666,12 +673,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
b_restored = YES; b_restored = YES;
} }
if (b_dropzone_active && !b_activeVideo)
{
b_dropzone_active = NO;
[self hideDropZone];
}
if (!b_nonembedded) if (!b_nonembedded)
{ {
if (([o_video_view isHidden] && b_activeVideo) || b_restored ) { if (([o_video_view isHidden] && b_activeVideo) || b_restored ) {
......
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