vlc/vlc-2.0 | branch: master | Felix Paul Kühne <[email protected]> | Sun Sep 29 15:51:26 2013 +0200| [3526593288101801e5952b0581f896639d552cda] | committer: Felix Paul Kühne
macosx: ensure that video view is always visible in fullscreen window (close #9526) Manual backport of 7fbedf14e > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=3526593288101801e5952b0581f896639d552cda --- modules/gui/macosx/MainWindow.m | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m index 8f01969..f5104ef 100644 --- a/modules/gui/macosx/MainWindow.m +++ b/modules/gui/macosx/MainWindow.m @@ -41,6 +41,12 @@ #import <vlc_services_discovery.h> #import <vlc_aout_intf.h> +@interface VLCMainWindow () +{ + BOOL b_video_view_was_hidden; +} +@end + @implementation VLCMainWindow static const float f_min_video_height = 70.0; @@ -2113,6 +2119,10 @@ static VLCMainWindow *_o_sharedInstance = nil; { b_fullscreen = NO; + /* 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]; + /* This function is private and should be only triggered at the end of the fullscreen change animation */ /* Make sure we don't see the o_video_view disappearing of the screen during this operation */ NSDisableScreenUpdates(); @@ -2127,6 +2137,9 @@ static VLCMainWindow *_o_sharedInstance = nil; [super makeKeyAndOrderFront:self]; /* our version contains a workaround */ else [[o_video_view window] makeKeyAndOrderFront: self]; + + [o_video_view setHidden: b_video_view_was_hidden]; + [o_fullscreen_window orderOut: self]; NSEnableScreenUpdates(); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
