X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=macosx%2FPictureController.m;h=4cc39331ff95cccf8a70b1b9c2677e5c84f7975b;hb=4f0019f03c2e85e8634150ff0c9a31bee6d35ce5;hp=19b3c0acfb766b67a0f8ed7ee3a3dcb060160b07;hpb=cc64c7c5a7e1153846311c8a5d6d60b1bf5eb7c2;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/macosx/PictureController.m b/macosx/PictureController.m index 19b3c0ac..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