Commit 9375a0d8 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

Mac OS X gui: Make sure maximized window respect Mac OS X Dock area. (Fix #1190)

parent 2b602203
...@@ -41,8 +41,6 @@ ...@@ -41,8 +41,6 @@
NSImage * o_img_play_pressed; NSImage * o_img_play_pressed;
NSImage * o_img_pause; NSImage * o_img_pause;
NSImage * o_img_pause_pressed; NSImage * o_img_pause_pressed;
NSRect o_saved_frame;
VLCWindow * o_fullscreen_window; VLCWindow * o_fullscreen_window;
NSViewAnimation * o_fullscreen_anim1; NSViewAnimation * o_fullscreen_anim1;
......
...@@ -55,8 +55,6 @@ ...@@ -55,8 +55,6 @@
o_img_pause = [NSImage imageNamed: @"pause_embedded"]; o_img_pause = [NSImage imageNamed: @"pause_embedded"];
o_img_pause_pressed = [NSImage imageNamed: @"pause_embedded_blue"]; o_img_pause_pressed = [NSImage imageNamed: @"pause_embedded_blue"];
o_saved_frame = NSMakeRect( 0.0f, 0.0f, 0.0f, 0.0f );
/* Useful to save o_view frame in fullscreen mode */ /* Useful to save o_view frame in fullscreen mode */
o_temp_view = [[NSView alloc] init]; o_temp_view = [[NSView alloc] init];
[o_temp_view setAutoresizingMask:NSViewHeightSizable | NSViewWidthSizable]; [o_temp_view setAutoresizingMask:NSViewHeightSizable | NSViewWidthSizable];
...@@ -103,24 +101,10 @@ ...@@ -103,24 +101,10 @@
[o_slider setEnabled: b_seekable]; [o_slider setEnabled: b_seekable];
} }
- (void)zoom:(id)sender - (BOOL)windowShouldZoom:(NSWindow *)sender toFrame:(NSRect)newFrame
{ {
if( ![self isZoomed] ) [self setFrame: newFrame display: YES animate: YES];
{ return YES;
NSRect zoomRect = [[self screen] frame];
o_saved_frame = [self frame];
/* we don't have to take care of the eventual menu bar and dock
as zoomRect will be cropped automatically by setFrame:display:
to the right rectangle */
[self setFrame: zoomRect display: YES animate: YES];
}
else
{
/* unzoom to the saved_frame if the o_saved_frame coords look sound
(just in case) */
if( o_saved_frame.size.width > 0 && o_saved_frame.size.height > 0 )
[self setFrame: o_saved_frame display: YES animate: YES];
}
} }
- (BOOL)windowShouldClose:(id)sender - (BOOL)windowShouldClose:(id)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