Changeset 19790 in webkit

Timestamp:

Feb 22, 2007 7:45:40 AM (17 years ago)

Author:

weinig

Message:

Reviewed by Maciej.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=12804 REGRESSION (r19043-r19063): suggestion popup doesn't work after pressing Option+Esc

This patch also fixes a bug where using the arrow keys while
the suggestion popup is open moves the caret instead of changing the
selection in the popup (for up/down) or accepting the selection and
closing the popup (for left/right).

• WebView/WebHTMLView.mm: (-[WebHTMLView keyDown:]): Changed to close the popup only if it was open before the current event, so that the Option-Esc that opens the popup will not close it immediately. (-[WebHTMLView _interceptEditingKeyEvent:]): Give the completion popup a chance to intercept keydown events. (-[WebTextCompleteController popupWindowIsOpen]): Added. Returns whether the suggestion popup is open.

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebHTMLView.mm (modified) (4 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-02-22  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Maciej.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=12804
+          REGRESSION (r19043-r19063): suggestion popup doesn't work after pressing Option+Esc
+
+        This patch also fixes a bug where using the arrow keys while
+        the suggestion popup is open moves the caret instead of changing the
+        selection in the popup (for up/down) or accepting the selection and
+        closing the popup (for left/right).
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView keyDown:]): Changed to close the popup only if it was open
+        before the current event, so that the Option-Esc that opens the popup will
+        not close it immediately.
+        (-[WebHTMLView _interceptEditingKeyEvent:]): Give the completion popup a
+        chance to intercept keydown events.
+        (-[WebTextCompleteController popupWindowIsOpen]): Added. Returns whether the
+        suggestion popup is open.
+
 2007-02-22  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebKit/WebView/WebHTMLView.mm

@@ -270 +270 @@
 - (void)doCompletion;
 - (void)endRevertingChange:(BOOL)revertChange moveLeft:(BOOL)goLeft;
+- (BOOL)popupWindowIsOpen;
 - (BOOL)filterKeyDown:(NSEvent *)event;
 - (void)_reflectSelection;
@@ -3383 +3384 @@
     _private->keyDownEvent = [event retain];
 
+    BOOL completionPopupWasOpen = _private->compController && [_private->compController popupWindowIsOpen];
     if (!eventWasSentToWebCore && core([self _frame])->eventHandler()->keyEvent(event)) {
-        // WebCore processed a key event, bail on any outstanding complete: UI
-        [_private->compController endRevertingChange:YES moveLeft:NO];
-    } else if (_private->compController && [_private->compController filterKeyDown:event]) {
-        // Consumed by complete: popup window
-    } else {
+        // WebCore processed a key event, bail on any preexisting complete: UI
+        if (completionPopupWasOpen)
+            [_private->compController endRevertingChange:YES moveLeft:NO];
+    } else if (!_private->compController || ![_private->compController filterKeyDown:event]) {
+        // Not consumed by complete: popup window
         [_private->compController endRevertingChange:YES moveLeft:NO];
         callSuper = YES;
@@ -5232 +5234 @@
     parameters.eventWasHandled = false;
     if (const PlatformKeyboardEvent* platformEvent = event->keyEvent()) {
+        NSEvent *macEvent = platformEvent->macEvent();
+        if ([macEvent type] == NSKeyDown && [_private->compController filterKeyDown:macEvent])
+            return true;
         parameters.event = event;
         _private->interpretKeyEventsParameters = &parameters;
-        [self interpretKeyEvents:[NSArray arrayWithObject:platformEvent->macEvent()]];
+        [self interpretKeyEvents:[NSArray arrayWithObject:macEvent]];
         _private->interpretKeyEventsParameters = 0;
     }
@@ -5766 +5771 @@
     }
     // else there is no state to abort if the window was not up
+}
+
+- (BOOL)popupWindowIsOpen
+{
+    return _popupWindow != nil;
 }