vlc | branch: master | David Fuhrmann <[email protected]> | Mon Sep 3 15:29:55 2012 +0200| [fc562ac89188f752b181825793b4c7bbe92d1908] | committer: David Fuhrmann
macosx: reset window size to the one before video was started close #6019 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fc562ac89188f752b181825793b4c7bbe92d1908 --- modules/gui/macosx/MainWindow.h | 2 ++ modules/gui/macosx/MainWindow.m | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/modules/gui/macosx/MainWindow.h b/modules/gui/macosx/MainWindow.h index b3dd311..6b6c0ed 100644 --- a/modules/gui/macosx/MainWindow.h +++ b/modules/gui/macosx/MainWindow.h @@ -161,6 +161,8 @@ VLCWindow *o_extra_video_window; id o_current_video_window; + + NSRect frameBeforePlayback; } + (VLCMainWindow *)sharedInstance; @property (readonly) BOOL fullscreen; diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m index 4df07f6..87dbf68 100644 --- a/modules/gui/macosx/MainWindow.m +++ b/modules/gui/macosx/MainWindow.m @@ -1887,9 +1887,13 @@ static VLCMainWindow *_o_sharedInstance = nil; BOOL b_videoPlayback = [[VLCMain sharedInstance] activeVideoPlayback]; if (b_videoPlayback) { + frameBeforePlayback = [self frame]; + // look for 'start at fullscreen' [[VLCMain sharedInstance] fullscreenChanged]; } else { + [[self animator] setFrame:frameBeforePlayback display:YES]; + [self makeFirstResponder: nil]; [o_detached_video_window orderOut: nil]; if (o_extra_video_window) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
