Changeset 19404 in webkit

Timestamp:

Feb 5, 2007 9:00:04 AM (17 years ago)

Author:

brmorris

Message:

raalexan, Reviewed by Yongjun Zhang.

DESC: Enhanced Input feature not working in 3.1 [TSW TMCN-6XYSLY]
​http://bugs.webkit.org/show_bug.cgi?id=12533

Location:

S60/branches/3.1m/WebKit

Files:

• BrowserCore/Formcontrols/inc/FControlInputWidget.h (modified) (2 diffs)
• BrowserCore/Formcontrols/src/FControlInputWidget.cpp (modified) (12 diffs)
• ChangeLog (modified) (1 diff)

S60/branches/3.1m/WebKit/BrowserCore/Formcontrols/inc/FControlInputWidget.h

@@ -359 +359 @@
         static TInt PredictiveTextOnOffGSNotifiaction( TAny* aObj );
         
-#ifdef RD_32_BROWSER
         /**
         * Sets the Cursor Position
@@ -371 +370 @@
         */
         void SetWebKitCursorPosition(const TKeyEvent& aKeyEvent);
-#endif
 
 

S60/branches/3.1m/WebKit/BrowserCore/Formcontrols/src/FControlInputWidget.cpp

@@ -57 +57 @@
 #include <WebKit.rsg>
 #endif
-#ifdef RD_32_BROWSER
+
 #include "WebKitCursor.h"
-#endif
 
 #include <centralrepository.h>
@@ -84 +83 @@
 static const TInt KASCII9 = 0x39;
 
-#ifdef RD_32_BROWSER
 static const TInt KCharacterWidth = 6;
-#endif
+
 
 
@@ -257 +255 @@
   {
   TBool t9Allowed;
-  
-#ifdef RD_32_BROWSER
   iRect = aInitialRectangle;
-#endif
+
     //Create a new repository
     CRepository* repository = CRepository::NewL( KCRUidAknFep );
@@ -372 +368 @@
     
     // move cursor
-#ifdef RD_32_BROWSER
     SetCursorPositionL(aInitialText, aInitialRectangle);
-#else
-    iEditor->SetCursorPosL(iEditor->TextLength(), EFalse);
-#endif
     
     iEditor->SetiCursorPos();// turns on correct t9 banner based on format
@@ -535 +527 @@
     else
         {
-#ifdef RD_32_BROWSER
       if (iType == ENormal && ((aKeyEvent.iScanCode == EStdKeyRightArrow && CurPos() == 0  && 
         iLastCurPos == iEditor->ReadableTextL()->Length()) || 
@@ -547 +538 @@
           {
           response = iEditor->OfferKeyEventL( aKeyEvent, aType ); 
-          }
-#else
-        response = iEditor->OfferKeyEventL( aKeyEvent, aType ); 
-#endif  
+          }  
         
         }
@@ -564 +552 @@
         }
     else if (aType == EEventKey  && (aKeyEvent.iScanCode == EStdKeyUpArrow ||
-             aKeyEvent.iScanCode == EStdKeyDownArrow 
-#ifdef RD_32_BROWSER
-             || aKeyEvent.iScanCode == EStdKeyRightArrow
-#endif
-             ))
+             aKeyEvent.iScanCode == EStdKeyDownArrow ||
+             aKeyEvent.iScanCode == EStdKeyRightArrow))
         {
         SimulateDoneKeyL((TStdScanCode )aKeyEvent.iScanCode );
@@ -588 +573 @@
         response = EKeyWasConsumed;
         }
-#ifdef RD_32_BROWSER
+
   iLastCurPos = CurPos();
-#endif
     return response;
     }
@@ -1242 +1226 @@
   }
 
-#ifdef RD_32_BROWSER
 // ---------------------------------------------------------
 // CControlInputWidget::SetCursorPosition
@@ -1251 +1234 @@
   {
   CWebKitView* webkitView = static_cast<CWebKitView*>(iParent);
-  TPoint pos = webkitView->Cursor()->Position();
-      
-    TInt const lineNumber = (pos.iY - aInitialRectangle.iTl.iY) / iFont.FontLineGap(); //iFont.HeightInPixels();
+  CWebKitCursor* cur = webkitView->Cursor();
+  if ( !cur ) 
+      {
+      return;
+      }
+  TPoint pos = cur->Position();  
+  TInt fontGap = iFont.FontLineGap();
+  TInt lineNumber = 0;
+
+  if(fontGap)
+    {
+    lineNumber = (pos.iY - aInitialRectangle.iTl.iY) / fontGap; //iFont.HeightInPixels();
+    }
     
     if(lineNumber)
@@ -1272 +1265 @@
     else
       {
-      TInt nCharAtPos = iFont.TextCount(aText, pos.iX);
+      TRect rect = iEditor->Rect();
+      TInt nCharAtPos = iFont.TextCount(aText, pos.iX - rect.iTl.iX);
       iEditor->SetCursorPosL(nCharAtPos, EFalse);
       iLastCurPos = nCharAtPos;   
@@ -1323 +1317 @@
       }
   }
-#endif
 //  End of File

S60/branches/3.1m/WebKit/ChangeLog

@@ +1 @@
+raalexan, Reviewed by Yongjun Zhang.
+        DESC: Enhanced Input feature not working in 3.1 [TSW TMCN-6XYSLY]
+        http://bugs.webkit.org/show_bug.cgi?id=12533
+
+        * BrowserCore/Formcontrols/inc/FControlInputWidget.h:
+        * BrowserCore/Formcontrols/src/FControlInputWidget.cpp:
+        (CControlInputWidget::ConstructTextEditorL):
+        (CControlInputWidget::OfferKeyEventL):
+        (CControlInputWidget::SetCursorPositionL):
+        (CControlInputWidget::SetWebKitCursorPosition):
+
 yongjzha, Reviewed by zalan.
         DESC: backport google.com/ig refreshing memory leak fix in <http://bugs.webkit.org/show_bug.cgi?id=10773> PPEN-6QYG7L