OSDN Git Service
(root)
/
handbrake-jp
/
handbrake-jp-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LinGui: make Help->Guide work on windows/mingw
[handbrake-jp/handbrake-jp-git.git]
/
macosx
/
PictureController.m
diff --git
a/macosx/PictureController.m
b/macosx/PictureController.m
index
19b3c0a
..
4cc3933
100644
(file)
--- a/
macosx/PictureController.m
+++ b/
macosx/PictureController.m
@@
-36,14
+36,8
@@
//------------------------------------------------------------------------------------
- (IBAction) showPictureWindow: (id)sender
{
//------------------------------------------------------------------------------------
- (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];
if ([[self window] isVisible])
{
[[self window] close];
@@
-54,15
+48,12
@@
[[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"PictureSizeWindowIsOpen"];
[self setToWindowedMode];
}
[[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"PictureSizeWindowIsOpen"];
[self setToWindowedMode];
}
- }
+
[self adjustFilterDisplay:nil];
[self adjustSizingDisplay:nil];
}
[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
/* 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 -
#pragma mark -
-- (IBAction) previewGoWindowed: (id)sender
-{
- [fPreviewController goWindowedScreen:self];
-}
+
- (IBAction) showPreviewWindow: (id)sender
{
- (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
- (void) setToWindowedMode
{
/* Set the window back to Floating Window mode