ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cocoa Port: 

- Fix display window restoration on startup if building the app with an OS X SDK earlier than v10.7. (Regression from r5349.)
This commit is contained in:
rogerman 2016-02-18 04:34:15 +00:00
parent b849c5b1c3
commit 8f01207e9d
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desmume/src/cocoa/userinterface/DisplayWindowController.h
View File

@ -159,13 +159,13 @@ class OGLVideoOutput;
- (id)initWithWindowNibName:(NSString *)windowNibName emuControlDelegate:(EmuControllerDelegate *)theEmuController; - (id)initWithWindowNibName:(NSString *)windowNibName emuControlDelegate:(EmuControllerDelegate *)theEmuController;
- (void) setupUserDefaults; - (void) setupUserDefaults;
- (BOOL) masterStatusBarState;
- (NSRect) masterWindowFrame;
- (double) masterWindowScale;
- (double) resizeWithTransform:(NSSize)normalBounds scalar:(double)scalar rotation:(double)angleDegrees; - (double) resizeWithTransform:(NSSize)normalBounds scalar:(double)scalar rotation:(double)angleDegrees;
- (double) maxScalarForContentBoundsWidth:(double)contentBoundsWidth height:(double)contentBoundsHeight; - (double) maxScalarForContentBoundsWidth:(double)contentBoundsWidth height:(double)contentBoundsHeight;
- (void) enterFullScreen; - (void) enterFullScreen;
- (void) exitFullScreen; - (void) exitFullScreen;
- (BOOL) masterStatusBarState;
- (NSRect) masterWindowFrame;
- (double) masterWindowScale;
- (IBAction) copy:(id)sender; - (IBAction) copy:(id)sender;
- (IBAction) changeHardwareMicGain:(id)sender; - (IBAction) changeHardwareMicGain:(id)sender;

30
desmume/src/cocoa/userinterface/DisplayWindowController.mm
View File

@ -522,6 +522,21 @@ static std::unordered_map<NSScreen *, DisplayWindowController *> _screenMap; //
return normalSize; return normalSize;
} }
- (BOOL) masterStatusBarState
{
return (([self assignedScreen] == nil) || !_useMavericksFullScreen) ? [self isShowingStatusBar] : _masterStatusBarState;
}
- (NSRect) masterWindowFrame
{
return (([self assignedScreen] == nil) || !_useMavericksFullScreen) ? [masterWindow frame] : _masterWindowFrame;
}
- (double) masterWindowScale
{
return (([self assignedScreen] == nil) || !_useMavericksFullScreen) ? [self displayScale] : _masterWindowScale;
}
- (double) resizeWithTransform:(NSSize)normalBounds scalar:(double)scalar rotation:(double)angleDegrees - (double) resizeWithTransform:(NSSize)normalBounds scalar:(double)scalar rotation:(double)angleDegrees
{ {
if ([self assignedScreen] != nil) if ([self assignedScreen] != nil)
@ -1463,21 +1478,6 @@ static std::unordered_map<NSScreen *, DisplayWindowController *> _screenMap; //
} }
} }
- (BOOL) masterStatusBarState
{
return ([self assignedScreen] == nil) ? [self isShowingStatusBar] : _masterStatusBarState;
}
- (NSRect) masterWindowFrame
{
return ([self assignedScreen] == nil) ? [masterWindow frame] : _masterWindowFrame;
}
- (double) masterWindowScale
{
return ([self assignedScreen] == nil) ? [self displayScale] : _masterWindowScale;
}
#endif #endif
- (BOOL)validateToolbarItem:(NSToolbarItem *)theItem - (BOOL)validateToolbarItem:(NSToolbarItem *)theItem