X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=macosx%2FPictureController.m;h=4cc39331ff95cccf8a70b1b9c2677e5c84f7975b;hb=338209fece85b5f79dfa89991827c50f7670a38a;hp=b02dab729e5f9d90584bd7109fe137134d636b2e;hpb=7e083011cd7ddde540f88d725efbc951c822fb9b;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/macosx/PictureController.m b/macosx/PictureController.m
index b02dab72..4cc39331 100644
--- a/macosx/PictureController.m
+++ b/macosx/PictureController.m
@@ -36,14 +36,8 @@
 //------------------------------------------------------------------------------------
 - (IBAction) showPictureWindow: (id)sender
 {
-    if ([fPreviewController fullScreen] == YES)
-    {
-        [self showWindow:sender];
-        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"PictureSizeWindowIsOpen"];
-        [self setToFullScreenMode];
-    }
-    else
-    {
+
+
         if ([[self window] isVisible])
         {
             [[self window] close];
@@ -54,15 +48,12 @@
             [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"PictureSizeWindowIsOpen"];
             [self setToWindowedMode];
         }
-    }
+
     [self adjustFilterDisplay:nil];
     [self adjustSizingDisplay:nil];
 }
 
-- (BOOL) previewFullScreenMode
-{
-    return [fPreviewController fullScreen];
-}
+
 
 /* this method is used to detect clicking on a tab in fSizeFilterView */
 - (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem
@@ -396,10 +387,7 @@
 
 #pragma mark -
 
-- (IBAction) previewGoWindowed: (id)sender
-{
-    [fPreviewController goWindowedScreen:self];
-}
+
 
 - (IBAction) showPreviewWindow: (id)sender
 {
@@ -409,16 +397,6 @@
 
 
 
-
-- (void) setToFullScreenMode
-{
-    int32_t shieldLevel = CGShieldingWindowLevel(); 
-    
-    [fPictureWindow setLevel:shieldLevel + 1]; 
-    // Show the window. 
-    [fPictureWindow makeKeyAndOrderFront:self];
-}
-
 - (void) setToWindowedMode
 {
     /* Set the window back to Floating Window mode 
@@ -651,6 +629,25 @@
     {
         [fModulusLabel setHidden:NO];
         [fModulusPopUp setHidden:NO];
+        if (sender == fModulusPopUp)
+        {
+            /* do a dry run with hb_fix aspect to get new modulus */
+            job->modulus = [[fModulusPopUp titleOfSelectedItem] intValue];
+            job->keep_ratio  = 1;
+            hb_fix_aspect( job, HB_KEEP_WIDTH );
+            if( job->height > fTitle->height )
+            {
+                job->height = fTitle->height;
+                hb_fix_aspect( job, HB_KEEP_HEIGHT );
+            }
+            [fWidthStepper      setIntValue: job->width];
+            [fWidthField        setIntValue: job->width];
+            if( [fAnamorphicPopUp indexOfSelectedItem] != 2) // if we are not loose or custom
+            {
+                [fHeightStepper     setIntValue: job->height];
+                [fHeightField       setIntValue: job->height];
+            }    
+        }
     }
     else
     {