diff options
Diffstat (limited to 'Framework')
| -rw-r--r-- | Framework/MASShortcutBinder.m | 1 | ||||
| -rw-r--r-- | Framework/MASShortcutView.m | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Framework/MASShortcutBinder.m b/Framework/MASShortcutBinder.m index 92ba6e8..4c0d7f9 100644 --- a/Framework/MASShortcutBinder.m +++ b/Framework/MASShortcutBinder.m @@ -109,6 +109,7 @@ // Just deleting the old shortcut if (newShortcut == nil) { + [_shortcuts removeObjectForKey:key]; return; } diff --git a/Framework/MASShortcutView.m b/Framework/MASShortcutView.m index 4952b4f..7b67411 100644 --- a/Framework/MASShortcutView.m +++ b/Framework/MASShortcutView.m @@ -398,6 +398,11 @@ void *kUserDataHint = &kUserDataHint; // Create a shortcut from the event MASShortcut *shortcut = [MASShortcut shortcutWithEvent:event]; + // Tab key must pass through. + if (shortcut.keyCode == kVK_Tab){ + return event; + } + // If the shortcut is a plain Delete or Backspace, clear the current shortcut and cancel recording if (!shortcut.modifierFlags && ((shortcut.keyCode == kVK_Delete) || (shortcut.keyCode == kVK_ForwardDelete))) { weakSelf.shortcutValue = nil; |