Commit cfd14b54 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: don't let the vout resize the window if we are in Lion's fullscreen mode

parent f1e8c225
...@@ -856,7 +856,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -856,7 +856,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
- (void)resizeWindow - (void)resizeWindow
{ {
if ( !b_fullscreen ) if ( !b_fullscreen && !(NSAppKitVersionNumber >= 1115.2 && [NSApp currentSystemPresentationOptions] == NSApplicationPresentationFullScreen) )
{ {
NSPoint topleftbase; NSPoint topleftbase;
NSPoint topleftscreen; NSPoint topleftscreen;
......
...@@ -477,10 +477,13 @@ static void OpenglSwap(vlc_gl_t *gl) ...@@ -477,10 +477,13 @@ static void OpenglSwap(vlc_gl_t *gl)
*/ */
- (void)setWindowFrameWithValue:(NSValue *)value - (void)setWindowFrameWithValue:(NSValue *)value
{ {
if (!(NSAppKitVersionNumber >= 1115.2 && [NSApp currentSystemPresentationOptions] == NSApplicationPresentationFullScreen))
{
NSRect frame = [value rectValue]; NSRect frame = [value rectValue];
if (frame.origin.x <= 0.0 && frame.origin.y <= 0.0) if (frame.origin.x <= 0.0 && frame.origin.y <= 0.0)
[[self window] center]; [[self window] center];
[[self window] setFrame:frame display:YES animate: YES]; [[self window] setFrame:frame display:YES animate: YES];
}
} }
/** /**
......
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