diff options
Diffstat (limited to 'macosx/PictureController.m')
| -rw-r--r-- | macosx/PictureController.m | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/macosx/PictureController.m b/macosx/PictureController.m index 19b3c0acf..5f916d8be 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 @@ -409,16 +400,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 |