[vlc-commits] macosx: fixed playlist and close entries in the Window menu (close #6239)

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Mar  9 13:55:00 2012 +0100| [77956b05910b44ee764815e08c0e5a52a0d984ed] | committer: Felix Paul Kühne

macosx: fixed playlist and close entries in the Window menu (close #6239)

the playlist item automatically reveals the main window now, in case it is hidden. the close item correctly closes the detached video output window now, when using the gray ui style

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=77956b05910b44ee764815e08c0e5a52a0d984ed
---

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

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 9121cc2..4ead704 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -635,6 +635,11 @@ static VLCMainWindow *_o_sharedInstance = nil;
 
 - (IBAction)togglePlaylist:(id)sender
 {
+    if (![self isVisible])
+    {
+        [self makeKeyAndOrderFront: sender];
+    }
+
     BOOL b_activeVideo = [[VLCMain sharedInstance] activeVideoPlayback];
 
     if ( !b_splitview_removed && ( (([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0 && !b_activeVideo) || (b_nonembedded && b_activeVideo && sender != nil) ))
@@ -2249,7 +2254,10 @@ static VLCMainWindow *_o_sharedInstance = nil;
 
 - (void)performClose:(id)sender
 {
-    [[VLCMainWindow sharedInstance] performClose: sender];
+    if (b_dark_interface)
+        [[VLCMainWindow sharedInstance] performClose: sender];
+    else
+        [super performClose: sender];
 }
 
 - (void)performMiniaturize:(id)sender