MacGui: Picture Preview and Settings window interaction fixes

- Putting the Preview Window into full screen mode no longer automatically opens up the Picture Settings inspector
- Fixed the Picture Settings inspector so that it isn't on top of every f'ing window on your screen.

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

1 files changed, 8 insertions, 4 deletions

diff --git a/macosx/PictureController.mm b/macosx/PictureController.mm
index df70de657..8752c24f5 100644
--- a/macosx/PictureController.mm
+++ b/macosx/PictureController.mm
@@ -37,6 +37,14 @@
 - (IBAction) showPictureWindow: (id)sender
 {
     [self showWindow:sender];
+    if ([fPreviewController fullScreen] == YES)
+    {
+    [self setToFullScreenMode];
+    }
+    else
+    {
+    [self setToWindowedMode];
+    }
 }
 
 - (IBAction) showPreviewWindow: (id)sender
@@ -46,7 +54,6 @@
 
 - (void) setToFullScreenMode
 {
-    [self showWindow:nil];
     int32_t shieldLevel = CGShieldingWindowLevel(); 
     
     [fPictureWindow setLevel:shieldLevel]; 
@@ -57,9 +64,6 @@
 - (void) setToWindowedMode
 {
     /* Set the window back to regular level */
-    
-    [self showWindow:nil];
-    
     [[self window] setLevel:NSNormalWindowLevel];
 }