Commit fc562ac8 authored by David Fuhrmann's avatar David Fuhrmann

macosx: reset window size to the one before video was started

close #6019
parent 083f1390
...@@ -161,6 +161,8 @@ ...@@ -161,6 +161,8 @@
VLCWindow *o_extra_video_window; VLCWindow *o_extra_video_window;
id o_current_video_window; id o_current_video_window;
NSRect frameBeforePlayback;
} }
+ (VLCMainWindow *)sharedInstance; + (VLCMainWindow *)sharedInstance;
@property (readonly) BOOL fullscreen; @property (readonly) BOOL fullscreen;
......
...@@ -1887,9 +1887,13 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1887,9 +1887,13 @@ static VLCMainWindow *_o_sharedInstance = nil;
BOOL b_videoPlayback = [[VLCMain sharedInstance] activeVideoPlayback]; BOOL b_videoPlayback = [[VLCMain sharedInstance] activeVideoPlayback];
if (b_videoPlayback) { if (b_videoPlayback) {
frameBeforePlayback = [self frame];
// look for 'start at fullscreen' // look for 'start at fullscreen'
[[VLCMain sharedInstance] fullscreenChanged]; [[VLCMain sharedInstance] fullscreenChanged];
} else { } else {
[[self animator] setFrame:frameBeforePlayback display:YES];
[self makeFirstResponder: nil]; [self makeFirstResponder: nil];
[o_detached_video_window orderOut: nil]; [o_detached_video_window orderOut: nil];
if (o_extra_video_window) if (o_extra_video_window)
......
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