Changeset 19913 in webkit

Timestamp:

Feb 28, 2007 2:11:18 PM (17 years ago)

Author:

brmorris

Message:

yadavall, Reviewed by Sachin

DESC: Toolbar should be activated only on long keypress CR: 102-5945
​http://bugs.webkit.org/show_bug.cgi?id=12816

Location:

S60/branches/3.1m/WebKit

Files:

• BrowserView/src/KeyEventHandler.cpp (modified) (4 diffs)
• ChangeLog (modified) (1 diff)

S60/branches/3.1m/WebKit/BrowserView/src/KeyEventHandler.cpp

@@ -166 +166 @@
             // clear the last event key
             iLastEventKey = KNullKeyEvent;
+            iElType = iWebKitView->FocusedElementType();
             return EKeyWasNotConsumed;
             }
@@ -195 +196 @@
                 case EKeyDevice3:
                     {
-                    iElType = iWebKitView->FocusedElementType();
+                    /*
+                    Toolbar is activated on long key press only if the element type during keydown and element type
+                    during EEventKey are EElementNone. This prevents toolbar from popping up in
+                    DHTML pages. Also, toolbar is activated when the user is not in fast scroll mode or in page overview mode
+                    */
+                    if( iElType == TBrCtlDefs::EElementNone
+                        && iWebKitView->FocusedElementType() == TBrCtlDefs::EElementNone
+                        && aKeyEvent.iRepeats
+                        && iWebKitView->WebKitControl().BrCtl().Capabilities() & TBrCtlDefs::ECapabilityToolBar
+                        && !iJoystickTimer->IsActive()
+                        && !iWebKitView->WebKitControl().InPageViewMode()
+                        )
+                        {
+                        iWebKitView->LaunchToolBarL();
+                        // and send the keyrelease event to webcore. otherwise, webcore gets
+                        // stuck in keypressed state
+                        CWebKitFrame* f = iWebKitView->MainFrame().FocusedFrame();
+                        if( f == NULL )
+                            {
+                            f = &iWebKitView->MainFrame();
+                            }
+
+                        //send the keypress event to webcore, so that it is not in keypress state
+                        TPoint absCursorPos = iWebKitView->Cursor()->Position() + iWebKitView->MainFrame().ToViewCoords(iWebKitView->MainFrame().ContentPosition());
+                        absCursorPos -= f->RectInGlobalCoords().iTl;
+                        absCursorPos = iWebKitView->MainFrame().ToDocCoords(absCursorPos);
+                        TPointerEvent event;
+                        event.iPosition = absCursorPos;
+                        event.iModifiers = 0;
+                        event.iType = TPointerEvent::EButton1Up;
+
+                        f->WebKitBridge().WebCoreBridge().PointerEvent(event);
+                        return EKeyWasConsumed;
+                        }
                     // fake key event down
                     keyResponse = HandleActivateKeysL( aKeyEvent, EEventKeyDown );
@@ -469 +503 @@
 TKeyResponse
 CKeyEventHandler::HandleActivateKeysL(
-    const TKeyEvent& aKeyEvent,
+    const TKeyEvent& /*aKeyEvent*/,
     TEventCode aEventCode )
     {
@@ -556 +590 @@
         else
             {
-            if( iElType == TBrCtlDefs::EElementNone
-                && iWebKitView->FocusedElementType() == TBrCtlDefs::EElementNone
-                && aEventCode == EEventKeyUp && aKeyEvent.iRepeats == 0
-                && iWebKitView->WebKitControl().BrCtl().Capabilities() & TBrCtlDefs::ECapabilityToolBar )
-                {
-                iWebKitView->LaunchToolBarL();
-                // and send the keyrelease event to webcore. otherwise, webcore gets 
-                // stuck in keypressed state
-                TPointerEvent event;
-                event.iPosition = absCursorPos;
-                event.iModifiers = 0;
-                event.iType = TPointerEvent::EButton1Up;
-                focused->WebKitBridge().WebCoreBridge().PointerEvent(event);
-                return EKeyWasConsumed;
-                }
 
             TPointerEvent event;

S60/branches/3.1m/WebKit/ChangeLog

@@ +1 @@
+yadavall, Reviewed by Sachin
+        DESC: Toolbar should be activated only on long keypress CR: 102-5945
+        http://bugs.webkit.org/show_bug.cgi?id=12816
+
+        * BrowserView/src/KeyEventHandler.cpp:
+        (CKeyEventHandler::HandleOfferKeyEventL):
+        (CKeyEventHandler::HandleActivateKeysL):
+
 spadma, reviewed by <Yongjun>
  DESC: Urls are doubly encoded. TSW ID: HIIN-6YMGYV