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

macosx: correctly hide the controls within the native fullscreen mode on Lion...

macosx: correctly hide the controls within the native fullscreen mode on Lion when displaying a video (closes #5505)

note that the ordinary fullscreen controller panel won't be present atm though

additionally, this commit can potentially impact the layout of the controller zone and lead to ugly effects, so please stress it a bit
(cherry picked from commit 86c4c01c6e17d66dc63dcb321f4ba6acb400fa38)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 1ed411ae
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -904,11 +904,19 @@ static VLCMainWindow *_o_sharedInstance = nil;
if (![[VLCMain sharedInstance] activeVideoPlayback])
[o_nonembedded_window orderOut: nil];
}
if( OSX_LION )
{
if( [NSApp presentationOptions] | NSApplicationPresentationFullScreen )
{
[o_bottombar_view setHidden: [[VLCMain sharedInstance] activeVideoPlayback]];
}
[o_bottombar_view setHidden: NO];
}
}
- (void)resizeWindow
{
if ( !b_fullscreen && !(OSX_LION && [NSApp currentSystemPresentationOptions] == NSApplicationPresentationFullScreen && b_nativeFullscreenMode) )
if ( !b_fullscreen && !(OSX_LION && [NSApp presentationOptions] == NSApplicationPresentationFullScreen && b_nativeFullscreenMode) )
{
NSPoint topleftbase;
NSPoint topleftscreen;
......@@ -1414,11 +1422,13 @@ static VLCMainWindow *_o_sharedInstance = nil;
#pragma mark Lion's native fullscreen handling
- (void)windowWillEnterFullScreen:(NSNotification *)notification
{
[o_video_view setFrame: [[self contentView] frame]];
[NSCursor setHiddenUntilMouseMoves: YES];
}
- (void)windowWillExitFullScreen:(NSNotification *)notification
{
[o_video_view setFrame: [o_split_view frame]];
[NSCursor setHiddenUntilMouseMoves: NO];
}
......
......@@ -461,6 +461,9 @@ static NSMutableArray *blackoutWindows = NULL;
{
[self registerForDraggedTypes:[NSArray arrayWithObjects:NSTIFFPboardType,
NSFilenamesPboardType, nil]];
[self setImageScaling: NSScaleToFit];
[self setImageFrameStyle: NSImageFrameNone];
[self setImageAlignment: NSImageAlignCenter];
}
- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
......
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