WebKit:
authorsullivan <sullivan@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Feb 2004 23:14:55 +0000 (23:14 +0000)
committersullivan <sullivan@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Feb 2004 23:14:55 +0000 (23:14 +0000)
        - WebKit part of fix for <rdar://problem/3292380>: Cycle Tabs keyboard shortcut
        (cmd-shift-arrows) conflicts with text editing

        Reviewed by Chris.

        * WebView.subproj/WebFrameView.m:
        (-[WebFrameView keyDown:]):
        If shift key is down along with an arrow key, call super rather than eating
        event since we don't handle any shifted events here.

WebBrowser:

        - fixed <rdar://problem/3292380>: Cycle Tabs keyboard shortcut
        (cmd-shift-arrows) conflicts with text editing

        Reviewed by Chris.

        * BrowserNSEventExtras.h:
        * BrowserNSEventExtras.m:
        (-[NSEvent isCommandLeftArrowKeyDown]):
        (-[NSEvent isCommandRightArrowKeyDown]):
        New methods

        * BrowserWindow.m:
        (-[BrowserWindow keyDown:]):
        Still honor old shortcuts of command-shift-arrows, but only
        if no other view has intercepted them already.

        * English.lproj/MainMenu.nib:
        Changed keyboard shortcuts for Select Next Tab and
        Select Previous Tab menu items to option-command-] and [

        * Debug/Shortcuts.html:
        Updated for these changes

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@6100 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/ChangeLog
WebKit/WebView.subproj/WebFrameView.m

index 9b9f3157b726167c062bcf90db6613ba8e7e9980..7174602581d7d600993b5b815dccf1d420d0e4d7 100644 (file)
@@ -1,3 +1,15 @@
+2004-02-19  John Sullivan  <sullivan@apple.com>
+
+        - WebKit part of fix for <rdar://problem/3292380>: Cycle Tabs keyboard shortcut 
+        (cmd-shift-arrows) conflicts with text editing
+
+        Reviewed by Chris.
+
+        * WebView.subproj/WebFrameView.m:
+        (-[WebFrameView keyDown:]):
+        If shift key is down along with an arrow key, call super rather than eating
+        event since we don't handle any shifted events here.
+
 2004-02-15  Darin Adler  <darin@apple.com>
 
         Reviewed by John and Don.
index f187d3f0b8970817188072063e46a3df8606080f..703670844ef9dbfa81ffc20b81aee49f528285b1 100644 (file)
@@ -614,6 +614,11 @@ static NSMutableDictionary *viewTypes;
                 callSuper = NO;
                 break;
             case NSUpArrowFunctionKey:
+                // We don't handle shifted arrow keys here, so let super have a chance.
+                if ([event modifierFlags] & NSShiftKeyMask) {
+                    callSuper = YES;
+                    break;
+                }
                 if (![self allowsScrolling] ||
                     [[[self window] firstResponder] isKindOfClass:[NSPopUpButton class]]) {
                     // Let arrow keys go through to pop up buttons
@@ -632,6 +637,11 @@ static NSMutableDictionary *viewTypes;
                 callSuper = NO;
                 break;
             case NSDownArrowFunctionKey:
+                // We don't handle shifted arrow keys here, so let super have a chance.
+                if ([event modifierFlags] & NSShiftKeyMask) {
+                    callSuper = YES;
+                    break;
+                }
                 if (![self allowsScrolling] ||
                     [[[self window] firstResponder] isKindOfClass:[NSPopUpButton class]]) {
                     // Let arrow keys go through to pop up buttons
@@ -650,6 +660,11 @@ static NSMutableDictionary *viewTypes;
                 callSuper = NO;
                 break;
             case NSLeftArrowFunctionKey:
+                // We don't handle shifted arrow keys here, so let super have a chance.
+                if ([event modifierFlags] & NSShiftKeyMask) {
+                    callSuper = YES;
+                    break;
+                }
                 // Check back/forward related keys.
                 if ([event modifierFlags] & NSCommandKeyMask) {
                     if (!maintainsBackForwardList) {
@@ -673,6 +688,11 @@ static NSMutableDictionary *viewTypes;
                 callSuper = NO;
                 break;
             case NSRightArrowFunctionKey:
+                // We don't handle shifted arrow keys here, so let super have a chance.
+                if ([event modifierFlags] & NSShiftKeyMask) {
+                    callSuper = YES;
+                    break;
+                }
                 // Check back/forward related keys.
                 if ([event modifierFlags] & NSCommandKeyMask) {
                     if (!maintainsBackForwardList) {