MacGui: Live Preview fixes

- Fix proper sizing when max source size and loose anamorphic is selected in presets
- Fix vertical alignment issue when the move height is >= the still preview height.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2011 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 14 insertions, 1 deletions

diff --git a/macosx/PictureController.mm b/macosx/PictureController.mm
index c0f5771af..08d5c3e8e 100644
--- a/macosx/PictureController.mm
+++ b/macosx/PictureController.mm
@@ -776,15 +776,28 @@ are maintained across different sources */
         }
         
         // lets reposition the movie if need be
+        
         NSPoint origin = [fPictureViewArea frame].origin;
         origin.x += trunc(([fPictureViewArea frame].size.width -
                            [fMovieView frame].size.width) / 2.0);
-        /* Since we are adding 15 to the height to allow for the controller bar
+        /* We need to detect whether or not we are currently less than the available height.*/
+        if (movieBounds.size.height < [fPictureView frame].size.height)
+        {
+        /* If we are, we are adding 15 to the height to allow for the controller bar so
          * we need to subtract half of that for the origin.y to get the controller bar
          * below the movie to it lines up vertically with where our still preview was
          */
         origin.y += trunc((([fPictureViewArea frame].size.height -
                             [fMovieView frame].size.height) / 2.0) - 7.5);
+        }
+        else
+        {
+        /* if we are >= to the height of the picture view area, the controller bar
+         * gets taken care of with picture resizing, so we do not want to offset the height
+         */
+        origin.y += trunc(([fPictureViewArea frame].size.height -
+                            [fMovieView frame].size.height) / 2.0);
+        }
         [fMovieView setFrameOrigin:origin]; 
         
         [fMovieView setMovie:aMovie];