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, 7 insertions, 2 deletions

diff --git a/macosx/HBPreviewController.mm b/macosx/HBPreviewController.mm
index 575a2c6ec..10c885587 100644
--- a/macosx/HBPreviewController.mm
+++ b/macosx/HBPreviewController.mm
@@ -449,6 +449,11 @@ MaxOutputWidth = title->width - job->crop[2] - job->crop[3];
     }
 }
 
+- (BOOL)fullScreen
+{
+    return isFullScreen;
+}
+
 - (IBAction)goFullScreen:(id)sender 
 { 
     // Get the screen information. 
@@ -534,7 +539,7 @@ MaxOutputWidth = title->width - job->crop[2] - job->crop[3];
         [self pictureSliderChanged:nil];
         
         /* set the picture settings pallete above the shielding level */
-        [fHBController picturePanelFullScreen];
+        //[fHBController picturePanelFullScreen];
     } 
 } 
 
@@ -575,7 +580,7 @@ MaxOutputWidth = title->width - job->crop[2] - job->crop[3];
     [fFullScreenToggleButton setTitle: @"Full Screen"];
     
     /* set the picture settings pallete back to normal level */
-    [fHBController picturePanelFullScreen];
+    [fHBController picturePanelWindowed];
     
     /* Release the display now that the we are back in windowed mode */
     CGDisplayRelease(displayID);