MacGui: Picture Settings - If Preview is in full screen and pic settings are open, disable the toggle effect for the settings button in preview and move the Picture Settings panel on top of the full screen preview.

- Fixes issue where going into full screen mode in preview requires two clicks on the settings button to get the inspector to show on top of the full screen preview.

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

1 files changed, 8 insertions, 6 deletions

diff --git a/macosx/PictureController.mm b/macosx/PictureController.mm
index 3c078191b..19be913ba 100644
--- a/macosx/PictureController.mm
+++ b/macosx/PictureController.mm
@@ -36,20 +36,22 @@
 //------------------------------------------------------------------------------------
 - (IBAction) showPictureWindow: (id)sender
 {
-    if ([[self window] isVisible])
+    if ([fPreviewController fullScreen] == YES)
     {
-        [[self window] close];
+        [self showWindow:sender];
+        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"PictureSizeWindowIsOpen"];
+        [self setToFullScreenMode];
     }
     else
     {
-        [self showWindow:sender];
-        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"PictureSizeWindowIsOpen"];
-        if ([fPreviewController fullScreen] == YES)
+        if ([[self window] isVisible])
         {
-            [self setToFullScreenMode];
+            [[self window] close];
         }
         else
         {
+            [self showWindow:sender];
+            [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"PictureSizeWindowIsOpen"];
             [self setToWindowedMode];
         }
     }