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

Revert "macosx vout: show complete window if we would resize beyond screen bounds"

This reverts commit 3effe298.
parent 3effe298
...@@ -355,7 +355,7 @@ static int Control (vout_display_t *vd, int query, va_list ap) ...@@ -355,7 +355,7 @@ static int Control (vout_display_t *vd, int query, va_list ap)
return VLC_SUCCESS; // this is okay, since the event will occur again when we have a window return VLC_SUCCESS; // this is okay, since the event will occur again when we have a window
NSRect windowFrame = [o_window frame]; NSRect windowFrame = [o_window frame];
NSRect glViewFrame = [sys->glView frame]; NSRect glViewFrame = [sys->glView frame];
NSRect screenFrame = [[o_window screen] visibleFrame]; NSSize screenSize = [[o_window screen] visibleFrame].size;
NSSize windowMinSize = [o_window minSize]; NSSize windowMinSize = [o_window minSize];
topleftbase.x = 0; topleftbase.x = 0;
...@@ -372,11 +372,10 @@ static int Control (vout_display_t *vd, int query, va_list ap) ...@@ -372,11 +372,10 @@ static int Control (vout_display_t *vd, int query, va_list ap)
i_height = windowMinSize.height; i_height = windowMinSize.height;
/* make sure the window doesn't exceed the screen size the window is on */ /* make sure the window doesn't exceed the screen size the window is on */
if (i_width > screenFrame.size.width) if (i_width > screenSize.width)
{ i_width = screenSize.width;
topleftscreen.x = screenFrame.origin.x; if (i_height > screenSize.height)
i_width = screenFrame.size.width; i_height = screenSize.height;
}
if( i_height != glViewFrame.size.height || i_width != glViewFrame.size.width ) if( i_height != glViewFrame.size.height || i_width != glViewFrame.size.width )
{ {
...@@ -386,12 +385,6 @@ static int Control (vout_display_t *vd, int query, va_list ap) ...@@ -386,12 +385,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
new_frame.origin.x = topleftscreen.x; new_frame.origin.x = topleftscreen.x;
new_frame.origin.y = topleftscreen.y - new_frame.size.height; new_frame.origin.y = topleftscreen.y - new_frame.size.height;
if( new_frame.size.height > screenFrame.size.height )
{
new_frame.size.height = screenFrame.size.height;
new_frame.origin.y = screenFrame.origin.y;
}
[sys->glView performSelectorOnMainThread:@selector(setWindowFrameWithValue:) withObject:[NSValue valueWithRect:new_frame] waitUntilDone:NO]; [sys->glView performSelectorOnMainThread:@selector(setWindowFrameWithValue:) withObject:[NSValue valueWithRect:new_frame] waitUntilDone:NO];
} }
[o_pool release]; [o_pool release];
......
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