Commit f82f7aac authored by David Fuhrmann's avatar David Fuhrmann

macosx: Fix controls bar state for playlist toggling

In enabled native fullscreen, fix playlist toggling (this is
possible via main menu).
parent 86089eb0
...@@ -398,6 +398,7 @@ static const float f_min_window_height = 307.; ...@@ -398,6 +398,7 @@ static const float f_min_window_height = 307.;
} }
} }
// Show split view and hide the video view
- (void)makeSplitViewVisible - (void)makeSplitViewVisible
{ {
if (self.darkInterface) if (self.darkInterface)
...@@ -418,13 +419,14 @@ static const float f_min_window_height = 307.; ...@@ -418,13 +419,14 @@ static const float f_min_window_height = 307.;
[self.videoView setHidden:YES]; [self.videoView setHidden:YES];
[_splitView setHidden:NO]; [_splitView setHidden:NO];
if (self.nativeFullscreenMode && [self fullscreen]) { if (self.nativeFullscreenMode && [self fullscreen]) {
[[self.controlsBar bottomBarView] setHidden:NO]; [self showControlsBar];
[self.fspanel setNonActive]; [self.fspanel setNonActive];
} }
[self makeFirstResponder:_playlistScrollView]; [self makeFirstResponder:_playlistScrollView];
} }
// Hides the split view and makes the vout view in foreground
- (void)makeSplitViewHidden - (void)makeSplitViewHidden
{ {
if (self.darkInterface) if (self.darkInterface)
...@@ -435,7 +437,7 @@ static const float f_min_window_height = 307.; ...@@ -435,7 +437,7 @@ static const float f_min_window_height = 307.;
[_splitView setHidden:YES]; [_splitView setHidden:YES];
[self.videoView setHidden:NO]; [self.videoView setHidden:NO];
if (self.nativeFullscreenMode && [self fullscreen]) { if (self.nativeFullscreenMode && [self fullscreen]) {
[[self.controlsBar bottomBarView] setHidden:YES]; [self hideControlsBar];
[self.fspanel setActive]; [self.fspanel setActive];
} }
...@@ -502,6 +504,7 @@ static const float f_min_window_height = 307.; ...@@ -502,6 +504,7 @@ static const float f_min_window_height = 307.;
[_splitView setHidden: NO]; [_splitView setHidden: NO];
[_playlistScrollView setHidden: NO]; [_playlistScrollView setHidden: NO];
[self.videoView setHidden: YES]; [self.videoView setHidden: YES];
[self showControlsBar];
} }
} }
......
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