Changeset 572 for trunk/Cocoa/Pester/Source/NJRHotKeyField.m

Timestamp:

07/20/09 06:03:42 (15 years ago)

Author:

Nicholas Riley

Message:

Support tabbing in preferences panel.

File:

• trunk/Cocoa/Pester/Source/NJRHotKeyField.m (modified) (3 diffs)

trunk/Cocoa/Pester/Source/NJRHotKeyField.m

@@ -111 +111 @@
 }
 
+- (void)textDidEndEditing:(NSNotification *)notification;
+{
+    [self showKeyEquivalentAttributedStringFinalized: YES];
+    [super textDidEndEditing: notification];
+}
+
 #pragma mark event handling
 
@@ -125 +131 @@
         id delegate = [self delegate];
         NSString *message = nil;
-        if (delegate != nil && ![delegate hotKeyField: self shouldAcceptCharacter: [characters characterAtIndex: 0] modifierFlags: modifierFlags rejectionMessage: &message]) {
+        unichar character = [characters characterAtIndex: 0];
+        if (character == NSTabCharacter || character == NSBackTabCharacter)
+            return;
+        if (delegate != nil && ![delegate hotKeyField: self shouldAcceptCharacter: character modifierFlags: modifierFlags rejectionMessage: &message]) {
             [self showStatus: message != nil ? message : @"key is unavailable for use"];
         } else {
@@ -137 +146 @@
 - (BOOL)performKeyEquivalent:(NSEvent *)theEvent;
 {
-    [self keyUp: theEvent];
+    if ([[self window] firstResponder] == self)
+        [self keyUp: theEvent];
     return [super performKeyEquivalent: theEvent];
 }