[vlc-commits] macosx: fix behaviour of toogle playlist when in native fullscreen

[David Fuhrmann]

vlc/vlc-2.0 | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Fri Apr 20 19:06:44 2012 +0200| [0796e26c1240e24297ba686b87b7461718d7a53d] | committer: David Fuhrmann

macosx: fix behaviour of toogle playlist when in native fullscreen

- do not allow to collapse the window
- block the playlist menu item for now, when video is playing
(cherry picked from commit 44a764957d136977c9d7e1bd76cc3e4eb68e17d0)

Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=0796e26c1240e24297ba686b87b7461718d7a53d
---

 modules/gui/macosx/MainWindow.m |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 539da47..81f1170 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -720,6 +720,11 @@ static VLCMainWindow *_o_sharedInstance = nil;
     BOOL b_activeVideo = [[VLCMain sharedInstance] activeVideoPlayback];
     BOOL b_restored = NO;
 
+    // TODO: implement toggle playlist in this situation (triggerd via menu item).
+    // but for now we block this case, to avoid displaying only the half
+    if( b_nativeFullscreenMode && b_fullscreen && b_activeVideo && sender != nil )
+        return;
+
     if (b_dropzone_active && !b_activeVideo && ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0)
     {
         b_dropzone_active = NO;
@@ -727,7 +732,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
         return;
     }
 
-    if ( !b_splitview_removed && ( (([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0 && b_activeVideo)
+    if ( !(b_nativeFullscreenMode && b_fullscreen) && !b_splitview_removed && ( (([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0 && b_activeVideo)
                                   || (b_nonembedded && sender != nil)
                                   || (!b_activeVideo && sender != nil)
                                   || b_minimized_view ) )