mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #4670 from atom/cmd-backtick-order

Browse source 
Use sendAction for cycling windows
This commit is contained in:
Cheng Zhao 2016-03-06 16:17:38 +09:00
commit d93ccd47a8
1 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
atom/browser/native_window_mac.mm
View file

@ -886,21 +886,11 @@ void NativeWindowMac::HandleKeyboardEvent(
// Handle the cmd+~ shortcut. // Handle the cmd+~ shortcut.
if ((event.os_event.modifierFlags & NSCommandKeyMask) /* cmd */ && if ((event.os_event.modifierFlags & NSCommandKeyMask) /* cmd */ &&
(event.os_event.keyCode == 50 /* ~ */)) { (event.os_event.keyCode == 50 /* ~ */)) {
// Switch to next visible window. if (event.os_event.modifierFlags & NSShiftKeyMask) {
NSArray* windows = [NSApp windows]; [NSApp sendAction:@selector(_cycleWindowsReversed:) to:nil from:nil];
NSIndexSet* indexes = [windows indexesOfObjectsPassingTest: } else {
^BOOL(id window, NSUInteger idx, BOOL* stop) { [NSApp sendAction:@selector(_cycleWindows:) to:nil from:nil];
return [window isVisible]; }
}];
if ([indexes count] == 0)
return;
NSUInteger current = [windows indexOfObject:event.os_event.window];
if (current == NSNotFound) // Some faked event.
return;
NSUInteger next = [indexes indexGreaterThanIndex:current];
if (next == NSNotFound)
next = [indexes firstIndex];
[[windows objectAtIndex:next] makeKeyAndOrderFront:nil];
} }
} }
} }