Changeset 17624 in webkit

Timestamp:

Nov 6, 2006 12:14:39 PM (17 years ago)

Author:

spadma

Message:

2006-11-06 yaharon <​yael.aharon@nokia.com>

Reviewed by Sachin.
DESC: [S60] Remove toolbar in touch environment
​http://bugs.webkit.org/show_bug.cgi?id=11527

• BrowserView/inc/PointerEventHandler.h:
• BrowserView/src/KeyEventHandler.cpp: (CKeyEventHandler::HandleActivateKeysL):
• BrowserView/src/PointerEventHandler.cpp: (CPointerEventHandler::HandlePointerEventL):

Location:

S60/trunk/WebKit

Files:

• BrowserView/inc/PointerEventHandler.h (modified) (1 diff)
• BrowserView/src/KeyEventHandler.cpp (modified) (2 diffs)
• BrowserView/src/PointerEventHandler.cpp (modified) (3 diffs)
• ChangeLog (modified) (1 diff)

S60/trunk/WebKit/BrowserView/inc/PointerEventHandler.h

@@ -115 +115 @@
     private: // New functions
 
-        /**
-        * @since 3.2
-        * @param const TPointerEvent&
-        * @return True or false
-        */
-        TBool  HandleToolBarPointerEventL(const TPointerEvent& aPointerEvent);
-
     private:    // Data
 

S60/trunk/WebKit/BrowserView/src/KeyEventHandler.cpp

@@ -49 +49 @@
 #include "WebKitLogger.h"
 #include "ToolBar.h"
+#include <aknutils.h>
 
 #ifdef RD_32_BROWSER
@@ -546 +547 @@
             if( iWebKitView->FocusedElementType() == TBrCtlDefs::EElementNone
                 && aEventCode == EEventKeyDown && aKeyEvent.iRepeats == 0
+                && !AknLayoutUtils::PenEnabled() 
                 /*&& iWebKitView->WebKitControl().BrCtl().Capabilities() & TBrCtlDefs::ECapabilityToolBar*/ )
                 {

S60/trunk/WebKit/BrowserView/src/PointerEventHandler.cpp

@@ -49 +49 @@
 #include "WebKitView.h"
 #include "historyview.h"
-#include "toolbar.h"
 
 // constants
@@ -148 +147 @@
         iWebKitView->SetFocusedElementType((TBrCtlDefs::TBrCtlElementType)elType);
 
-        // Handle toolbar
-        if(HandleToolBarPointerEventL( aPointerEvent ))
-            {
-             return;  
-             }
-        
         TPointerEvent pointerEvent = aPointerEvent;
         pointerEvent.iPosition = absCursorPos;
@@ -181 +174 @@
 
 
-TBool CPointerEventHandler::HandleToolBarPointerEventL(const TPointerEvent& aPointerEvent)
-    {
-    TBool eventConsumed = EFalse;
-    if( iWebKitView->WebKitControl().BrCtl().Capabilities() & TBrCtlDefs::ECapabilityToolBar)
-        {
-        if(iWebKitView->ToolBar())
-            {
-            iWebKitView->ToolBar()->HandlePointerEventL(aPointerEvent);
-            eventConsumed = ETrue;  
-            }
-        else
-            {
-            if(aPointerEvent.iType == TPointerEvent::EButton1Down)
-                {
-                 iTimeNow.HomeTime();
-                 if (iWebKitView->FocusedElementType() == TBrCtlDefs::EElementNone)
-                     {
-                     iEnableToolBar = ETrue; 
-                     }
-                 else
-                     {
-                     iEnableToolBar = EFalse; 
-                     }
-                }
-            else if (aPointerEvent.iType == TPointerEvent::EButton1Up && iEnableToolBar && iWebKitView->FocusedElementType() == TBrCtlDefs::EElementNone)
-                {
-                 TTime launchTime;
-                 launchTime.HomeTime();
-                 if(launchTime.MicroSecondsFrom(iTimeNow) > KMicroInterval)
-                    {
-                    iWebKitView->Cursor()->SetPosition(aPointerEvent.iPosition);
-                    iWebKitView->LaunchToolBarL();
-                    iEnableToolBar = EFalse;
-                    }
-                 eventConsumed = ETrue; 
-                } 
-            } 
-        }
-        return eventConsumed;  
-    }
-
-
 void CPointerEventHandler::HandlePageScalerPointerEventL(const TPointerEvent& aPointerEvent)
     {

S60/trunk/WebKit/ChangeLog

@@ +1 @@
+2006-11-06  yaharon  <yael.aharon@nokia.com>
+
+        Reviewed by Sachin.
+        DESC: [S60] Remove toolbar in touch environment
+        http://bugs.webkit.org/show_bug.cgi?id=11527
+
+        * BrowserView/inc/PointerEventHandler.h:
+        * BrowserView/src/KeyEventHandler.cpp:
+        (CKeyEventHandler::HandleActivateKeysL):
+        * BrowserView/src/PointerEventHandler.cpp:
+        (CPointerEventHandler::HandlePointerEventL):
+
 2006-11-01  ligman  <joseph.ligman@nokia.com>