vlc | branch: master | David Fuhrmann <[email protected]> | Sun Sep 29 11:54:21 2013 +0200| [7fbedf14e13109d40af17fb5e17c8b0411c02b4c] | committer: David Fuhrmann
macosx: ensure that video view is always visible in fullscreen window (close #9526) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7fbedf14e13109d40af17fb5e17c8b0411c02b4c --- modules/gui/macosx/Windows.h | 2 ++ modules/gui/macosx/Windows.m | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/modules/gui/macosx/Windows.h b/modules/gui/macosx/Windows.h index 2dd7ad7..e110ba8 100644 --- a/modules/gui/macosx/Windows.h +++ b/modules/gui/macosx/Windows.h @@ -105,6 +105,8 @@ static const float f_min_video_height = 70.0; BOOL b_window_is_invisible; NSInteger i_originalLevel; + BOOL b_video_view_was_hidden; + NSTimer *t_hide_mouse_timer; // true when the window is in transition for entering lion fullscreen diff --git a/modules/gui/macosx/Windows.m b/modules/gui/macosx/Windows.m index cec3a9e..6094363 100644 --- a/modules/gui/macosx/Windows.m +++ b/modules/gui/macosx/Windows.m @@ -813,6 +813,10 @@ 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 */ NSDisableScreenUpdates(); [o_video_view retain]; @@ -1017,6 +1021,8 @@ if ([[o_video_view subviews] count] > 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 */ [o_fullscreen_window orderOut: self]; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
