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

Cocoa Port: Better guarantee that display views will always be assigned a display ID.

This commit is contained in:
rogerman 2017-09-19 14:47:55 -07:00
parent 830dd0d78c
commit aa04c8f233
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
desmume/src/frontend/cocoa/userinterface/DisplayWindowController.mm
View File

@ -681,6 +681,7 @@ static std::unordered_map<NSScreen *, DisplayWindowController *> _screenMap; //
CGDirectDisplayID displayID = [idNumber unsignedIntValue];
[[[self view] cdsVideoOutput] setCurrentDisplayID:displayID];
[[[self view] cdsVideoOutput] clientDisplayView]->UpdateView();
}
- (void) respondToScreenChange:(NSNotification *)aNotification
@ -1353,8 +1354,21 @@ static std::unordered_map<NSScreen *, DisplayWindowController *> _screenMap; //
[self setupUserDefaults];
}
- (void)windowDidBecomeKey:(NSNotification *)notification
{
if ([[[self view] cdsVideoOutput] currentDisplayID] == 0)
{
[self updateDisplayID];
}
}
- (void)windowDidBecomeMain:(NSNotification *)notification
{
if ([[[self view] cdsVideoOutput] currentDisplayID] == 0)
{
[self updateDisplayID];
}
[emuControl setMainWindow:self];
[emuControl updateDisplayPanelTitles];
[view setNextResponder:[self window]];
@ -1490,7 +1504,6 @@ static std::unordered_map<NSScreen *, DisplayWindowController *> _screenMap; //
- (void)windowDidChangeScreen:(NSNotification *)notification
{
[self updateDisplayID];
[[[self view] cdsVideoOutput] clientDisplayView]->UpdateView();
}
#if defined(MAC_OS_X_VERSION_10_7) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7)