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

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index f40c98f502150d5134eb70ea332e111de4f80bdd..6b18935b2a15a2bd6b79b2017c80b0f65c7bb9ea 100644 (file)
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -1489,19 +1489,25 @@ CATCH_MOUSE_EVENTS
         f_x = 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
     {
-        f_x = 1.0;
-        f_y = bounds.size.width * VOUT_ASPECT_FACTOR /
-            p_vout->output.i_aspect / bounds.size.height;
+        /* Quad size is set in order to preserve the aspect ratio */
+        int fill = ( config_GetInt( p_vout, "macosx-fill" ) &&
+                     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;
+        }
     }
 }