aboutsummaryrefslogtreecommitdiff
path: root/AppKit
diff options
context:
space:
mode:
Diffstat (limited to 'AppKit')
-rw-r--r--AppKit/GTMHotKeyTextField.m10
1 files changed, 10 insertions, 0 deletions
diff --git a/AppKit/GTMHotKeyTextField.m b/AppKit/GTMHotKeyTextField.m
index 8c8703d..df5853a 100644
--- a/AppKit/GTMHotKeyTextField.m
+++ b/AppKit/GTMHotKeyTextField.m
@@ -94,6 +94,12 @@ static CFStringRef kGTM_TISPropertyUnicodeKeyLayoutData = NULL;
return NSCopyObject(self, 0, zone);
}
+- (NSString *)description {
+ return [NSString stringWithFormat:@"<%@ %p> - %@",
+ [self class], self,
+ [GTMHotKeyTextFieldCell displayStringForHotKey:self]];
+}
+
@end
@implementation GTMHotKeyTextField
@@ -672,7 +678,11 @@ GTMOBJECT_SINGLETON_BOILERPLATE(GTMHotKeyFieldEditor, sharedHotKeyFieldEditor)
(modifierFlags == (NSCommandKeyMask | NSShiftKeyMask))) {
NSBeep();
bypass = YES;
+ } else if (modifierFlags == 0 || modifierFlags == NSShiftKeyMask) {
+ // Probably attempting to tab around the dialog.
+ bypass = YES;
}
+
} else if ((keyCode == 12) && (modifierFlags == NSCommandKeyMask)) {
// Don't eat Cmd-Q. Users could have it as a hotkey, but its more likely
// they're trying to quit