Commit a13d32fb authored by David Fuhrmann's avatar David Fuhrmann Committed by Felix Paul Kühne

macosx: fix start and end rect of fullscreen animation when we have a non-embedded vout-window

Signed-off-by: default avatarFelix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit 7ecb24c8689710e32f71e20d2cc51ae5b57e7151)
parent ac2f9d9a
......@@ -1370,8 +1370,8 @@ static VLCMainWindow *_o_sharedInstance = nil;
/* We can't change the styleMask of an already created NSWindow, so we create another window, and do eye catching stuff */
rect = [[o_video_view superview] convertRect: [o_video_view frame] toView: nil]; /* Convert to Window base coord */
rect.origin.x += [self frame].origin.x;
rect.origin.y += [self frame].origin.y;
rect.origin.x += [[o_video_view window] frame].origin.x;
rect.origin.y += [[o_video_view window] frame].origin.y;
o_fullscreen_window = [[VLCWindow alloc] initWithContentRect:rect styleMask: NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES];
[o_fullscreen_window setBackgroundColor: [NSColor blackColor]];
[o_fullscreen_window setCanBecomeKeyWindow: YES];
......@@ -1602,8 +1602,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
}
frame = [[o_temp_view superview] convertRect: [o_temp_view frame] toView: nil]; /* Convert to Window base coord */
frame.origin.x += [self frame].origin.x;
frame.origin.y += [self frame].origin.y;
id targetWindow = b_nonembedded ? o_nonembedded_window : self;
frame.origin.x += [targetWindow frame].origin.x;
frame.origin.y += [targetWindow frame].origin.y;
dict2 = [[NSMutableDictionary alloc] initWithCapacity:2];
[dict2 setObject:self forKey:NSViewAnimationTargetKey];
......
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