Skip to content

V
vlc-2-2
Commit af3abae3 authored by Eric Petit's avatar Eric Petit
Browse files
Options

macosx/vout.m : fixed --macosx-fillscreen

parent 69db2459
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 11 deletions
modules/gui/macosx/vout.m
View file @ af3abae3
...@@ -1489,19 +1489,25 @@ CATCH_MOUSE_EVENTS ...@@ -1489,19 +1489,25 @@ CATCH_MOUSE_EVENTS
f_x = 1.0; f_x = 1.0;
f_y = 1.0; f_y = 1.0;
} }
/* Quad size is set in order to preserve the aspect ratio */
else if( bounds.size.height * p_vout->output.i_aspect <
bounds.size.width * VOUT_ASPECT_FACTOR )
{
f_x = bounds.size.height * p_vout->output.i_aspect /
VOUT_ASPECT_FACTOR / bounds.size.width;
f_y = 1.0;
}
else else
{ {
f_x = 1.0; /* Quad size is set in order to preserve the aspect ratio */
f_y = bounds.size.width * VOUT_ASPECT_FACTOR / int fill = ( config_GetInt( p_vout, "macosx-fill" ) &&
p_vout->output.i_aspect / bounds.size.height; p_vout->b_fullscreen );
int large = ( bounds.size.height * p_vout->output.i_aspect <
bounds.size.width * VOUT_ASPECT_FACTOR );
if( ( large && !fill ) || ( !large && fill ) )
{
f_x = bounds.size.height * p_vout->output.i_aspect /
VOUT_ASPECT_FACTOR / bounds.size.width;
f_y = 1.0;
}
else
{
f_x = 1.0;
f_y = bounds.size.width * VOUT_ASPECT_FACTOR /
p_vout->output.i_aspect / bounds.size.height;
}
} }
} }
......
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