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, 8 insertions, 13 deletions

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 3ac95d006..1da9162ce 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -3515,10 +3515,7 @@ fWorkingCount = 0;
 	hb_job_t * job = title->job;
 	fTitle = title;
     
-    /* Reset the new title in fPictureController */
-    [fPictureController SetTitle:title];
-    
-	/*Set Source Size Field Here */
+    /*Set Source Size Field Here */
     [fPicSettingsSrc setStringValue: [NSString stringWithFormat: @"%d x %d", fTitle->width, fTitle->height]];
 	
 	/* Set Auto Crop to on upon selecting a new title  */
@@ -3533,10 +3530,8 @@ fWorkingCount = 0;
 	AutoCropLeft = job->crop[2];
 	AutoCropRight = job->crop[3];
 
-	/* Run Through encoderPopUpChanged to see if there
-		needs to be any pic value modifications based on encoder settings */
-	//[self encoderPopUpChanged: NULL];
-	/* END Get and set the initial pic size for display */ 
+	/* Reset the new title in fPictureController */
+    [fPictureController SetTitle:title];
 
     /* Update subtitle popups */
     hb_subtitle_t * subtitle;
@@ -4027,9 +4022,9 @@ the user is using "Custom" settings by determining the sender*/
 - (IBAction) revertPictureSizeToMax: (id) sender
 {
 	hb_job_t * job = fTitle->job;
-	/* Here we apply the max source storage width and height */
-    job->width = fTitle->width-fTitle->job->crop[2]-fTitle->job->crop[3];
-    job->height = fTitle->height-fTitle->job->crop[0]-fTitle->job->crop[1];
+	/* Here we apply the title source and height */
+    job->width = fTitle->width;
+    job->height = fTitle->height;
     
     [self calculatePictureSizing: sender];
     /* We call method to change UI to reflect whether a preset is used or not*/    
@@ -5766,9 +5761,9 @@ return YES;
                 [fPictureController setDecomb:0];
             }
         }
-        [self calculatePictureSizing:nil];
         /* we call SetTitle: in fPictureController so we get an instant update in the Picture Settings window */
-        [fPictureController SetTitle:fTitle]; 
+        [fPictureController SetTitle:fTitle];
+        [self calculatePictureSizing:nil];
     }
 }