Commit f2724d62 authored by Felix Paul Kühne's avatar 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
(cherry picked from commit 77956b05910b44ee764815e08c0e5a52a0d984ed)
parent 93aaf6cf
...@@ -635,6 +635,11 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -635,6 +635,11 @@ static VLCMainWindow *_o_sharedInstance = nil;
- (IBAction)togglePlaylist:(id)sender - (IBAction)togglePlaylist:(id)sender
{ {
if (![self isVisible])
{
[self makeKeyAndOrderFront: sender];
}
BOOL b_activeVideo = [[VLCMain sharedInstance] activeVideoPlayback]; BOOL b_activeVideo = [[VLCMain sharedInstance] activeVideoPlayback];
if ( !b_splitview_removed && ( (([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0 && !b_activeVideo) || (b_nonembedded && b_activeVideo && sender != nil) )) 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; ...@@ -2249,7 +2254,10 @@ static VLCMainWindow *_o_sharedInstance = nil;
- (void)performClose:(id)sender - (void)performClose:(id)sender
{ {
if (b_dark_interface)
[[VLCMainWindow sharedInstance] performClose: sender]; [[VLCMainWindow sharedInstance] performClose: sender];
else
[super performClose: sender];
} }
- (void)performMiniaturize:(id)sender - (void)performMiniaturize:(id)sender
......
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