vlc | branch: master | Felix Paul Kühne <[email protected]> | Sat Mar 10 18:18:42 2012 +0100| [51cbd1c24870eec1b386ee978d4ebcaae4a0ac9e] | committer: Felix Paul Kühne
macosx: allow to hide the drop zone while the playlist is empty using an option-click on the playlist toggle button (refs #6213) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=51cbd1c24870eec1b386ee978d4ebcaae4a0ac9e --- modules/gui/macosx/MainWindow.m | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m index 05edbda..847bcf6 100644 --- a/modules/gui/macosx/MainWindow.m +++ b/modules/gui/macosx/MainWindow.m @@ -643,6 +643,13 @@ static VLCMainWindow *_o_sharedInstance = nil; BOOL b_activeVideo = [[VLCMain sharedInstance] activeVideoPlayback]; 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) || (b_nonembedded && sender != nil) || (!b_activeVideo && sender != nil) @@ -666,12 +673,6 @@ static VLCMainWindow *_o_sharedInstance = nil; b_restored = YES; } - if (b_dropzone_active && !b_activeVideo) - { - b_dropzone_active = NO; - [self hideDropZone]; - } - if (!b_nonembedded) { if (([o_video_view isHidden] && b_activeVideo) || b_restored ) { _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
