From be67dca686474fc57ff92c341fe5fe3a9dc55a5e Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 3 Mar 2016 20:53:58 -0800 Subject: [PATCH] Use _cycleWindows selector to implement cmd-` --- atom/browser/native_window_mac.mm | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm index 9d9f2a2..01073ed 100644 --- a/atom/browser/native_window_mac.mm +++ b/atom/browser/native_window_mac.mm @@ -896,21 +896,11 @@ void NativeWindowMac::HandleKeyboardEvent( // Handle the cmd+~ shortcut. if ((event.os_event.modifierFlags & NSCommandKeyMask) /* cmd */ && (event.os_event.keyCode == 50 /* ~ */)) { - // Switch to next visible window. - NSArray* windows = [NSApp windows]; - NSIndexSet* indexes = [windows indexesOfObjectsPassingTest: - ^BOOL(id window, NSUInteger idx, BOOL* stop) { - 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]; + if (event.os_event.modifierFlags & NSShiftKeyMask) { + [NSApp sendAction:@selector(_cycleWindowsReversed:) to:nil from:nil]; + } else { + [NSApp sendAction:@selector(_cycleWindows:) to:nil from:nil]; + } } } } -- 2.7.4