Commit 3050c601 authored by Felix Paul Kühne's avatar Felix Paul Kühne Committed by Jean-Baptiste Kempf

macosx: support the Lion-style resizing within the black main window when...

macosx: support the Lion-style resizing within the black main window when _compiling_ (no joke) on Lion
(cherry picked from commit c30858cfe6e1ca7d0e9d6c7cbc626c736c3fa542)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 1a67d630
...@@ -73,17 +73,14 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -73,17 +73,14 @@ static VLCMainWindow *_o_sharedInstance = nil;
b_dark_interface = config_GetInt( VLCIntf, "macosx-interfacestyle" ); b_dark_interface = config_GetInt( VLCIntf, "macosx-interfacestyle" );
if (b_dark_interface) if (b_dark_interface)
{ #ifdef MAC_OS_X_VERSION_10_7
styleMask = NSBorderlessWindowMask | NSResizableWindowMask;
#else
styleMask = NSBorderlessWindowMask; styleMask = NSBorderlessWindowMask;
self = [super initWithContentRect:contentRect styleMask:styleMask #endif
backing:backingType defer:flag];
} self = [super initWithContentRect:contentRect styleMask:styleMask
else backing:backingType defer:flag];
{
self = [super initWithContentRect:contentRect styleMask:styleMask
backing:backingType defer:flag];
}
[[VLCMain sharedInstance] updateTogglePlaylistState]; [[VLCMain sharedInstance] updateTogglePlaylistState];
...@@ -401,6 +398,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -401,6 +398,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
winrect.size.height = winrect.size.height - f_titleBarHeight; winrect.size.height = winrect.size.height - f_titleBarHeight;
[o_split_view setFrame: winrect]; [o_split_view setFrame: winrect];
[o_video_view setFrame: winrect]; [o_video_view setFrame: winrect];
[self display]; [self display];
} }
else else
...@@ -916,7 +914,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -916,7 +914,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
if ([o_video_view window] != self) if ([o_video_view window] != self)
{ {
[o_video_view removeFromSuperviewWithoutNeedingDisplay]; [o_video_view removeFromSuperviewWithoutNeedingDisplay];
[o_video_view setFrame: [o_right_split_view frame]]; [o_video_view setFrame: [o_split_view frame]];
[[self contentView] addSubview:o_video_view positioned:NSWindowAbove relativeTo:nil]; [[self contentView] addSubview:o_video_view positioned:NSWindowAbove relativeTo:nil];
} }
b_nonembedded = NO; b_nonembedded = NO;
......
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