Commit 7fbedf14 authored by David Fuhrmann's avatar David Fuhrmann

macosx: ensure that video view is always visible in fullscreen window (close #9526)

parent 854c894e
...@@ -105,6 +105,8 @@ static const float f_min_video_height = 70.0; ...@@ -105,6 +105,8 @@ static const float f_min_video_height = 70.0;
BOOL b_window_is_invisible; BOOL b_window_is_invisible;
NSInteger i_originalLevel; NSInteger i_originalLevel;
BOOL b_video_view_was_hidden;
NSTimer *t_hide_mouse_timer; NSTimer *t_hide_mouse_timer;
// true when the window is in transition for entering lion fullscreen // true when the window is in transition for entering lion fullscreen
......
...@@ -813,6 +813,10 @@ ...@@ -813,6 +813,10 @@
return; return;
} }
/* Make sure video view gets visible in case the playlist was visible before */
b_video_view_was_hidden = [o_video_view isHidden];
[o_video_view setHidden: NO];
/* Make sure we don't see the o_video_view disappearing of the screen during this operation */ /* Make sure we don't see the o_video_view disappearing of the screen during this operation */
NSDisableScreenUpdates(); NSDisableScreenUpdates();
[o_video_view retain]; [o_video_view retain];
...@@ -1017,6 +1021,8 @@ ...@@ -1017,6 +1021,8 @@
if ([[o_video_view subviews] count] > 0) if ([[o_video_view subviews] count] > 0)
[self makeFirstResponder: [[o_video_view subviews] objectAtIndex:0]]; [self makeFirstResponder: [[o_video_view subviews] objectAtIndex:0]];
[o_video_view setHidden: b_video_view_was_hidden];
[super makeKeyAndOrderFront:self]; /* our version (in main window) contains a workaround */ [super makeKeyAndOrderFront:self]; /* our version (in main window) contains a workaround */
[o_fullscreen_window orderOut: self]; [o_fullscreen_window orderOut: self];
......
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