Changeset 19774 in webkit
- Timestamp:
- Feb 21, 2007 10:55:37 AM (17 years ago)
- Location:
- S60/branches/3.1m/WebKit
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
S60/branches/3.1m/WebKit/BrowserCore/Formcontrols/inc/FControlInputWidget.h
r19404 r19774 359 359 static TInt PredictiveTextOnOffGSNotifiaction( TAny* aObj ); 360 360 361 #ifdef RD_32_BROWSER 361 362 /** 362 363 * Sets the Cursor Position … … 370 371 */ 371 372 void SetWebKitCursorPosition(const TKeyEvent& aKeyEvent); 373 #endif 372 374 373 375 -
S60/branches/3.1m/WebKit/BrowserCore/Formcontrols/src/FControlInputWidget.cpp
r19423 r19774 57 57 #include <WebKit.rsg> 58 58 #endif 59 59 #ifdef RD_32_BROWSER 60 60 #include "WebKitCursor.h" 61 #endif 61 62 62 63 #include <centralrepository.h> … … 83 84 static const TInt KASCII9 = 0x39; 84 85 86 #ifdef RD_32_BROWSER 85 87 static const TInt KCharacterWidth = 6; 86 88 #endif 87 89 88 90 … … 255 257 { 256 258 TBool t9Allowed; 259 260 #ifdef RD_32_BROWSER 257 261 iRect = aInitialRectangle; 258 262 #endif 259 263 //Create a new repository 260 264 CRepository* repository = CRepository::NewL( KCRUidAknFep ); … … 368 372 369 373 // move cursor 374 #ifdef RD_32_BROWSER 370 375 SetCursorPositionL(aInitialText, aInitialRectangle); 376 #else 377 iEditor->SetCursorPosL(iEditor->TextLength(), EFalse); 378 #endif 371 379 372 380 iEditor->SetiCursorPos();// turns on correct t9 banner based on format … … 543 551 else 544 552 { 553 #ifdef RD_32_BROWSER 545 554 if (iType == ENormal && ((aKeyEvent.iScanCode == EStdKeyRightArrow && CurPos() == 0 && 546 555 iLastCurPos == iEditor->ReadableTextL()->Length()) || … … 554 563 { 555 564 response = iEditor->OfferKeyEventL( aKeyEvent, aType ); 556 } 565 } 566 #else 567 response = iEditor->OfferKeyEventL( aKeyEvent, aType ); 568 #endif 557 569 558 570 } … … 568 580 } 569 581 else if (aType == EEventKey && (aKeyEvent.iScanCode == EStdKeyUpArrow || 570 aKeyEvent.iScanCode == EStdKeyDownArrow || 571 aKeyEvent.iScanCode == EStdKeyRightArrow)) 582 aKeyEvent.iScanCode == EStdKeyDownArrow 583 #ifdef RD_32_BROWSER 584 || aKeyEvent.iScanCode == EStdKeyRightArrow 585 #endif 586 )) 572 587 { 573 588 SimulateDoneKeyL((TStdScanCode )aKeyEvent.iScanCode ); … … 589 604 response = EKeyWasConsumed; 590 605 } 591 606 #ifdef RD_32_BROWSER 592 607 iLastCurPos = CurPos(); 608 #endif 593 609 return response; 594 610 } … … 1242 1258 } 1243 1259 1260 #ifdef RD_32_BROWSER 1244 1261 // --------------------------------------------------------- 1245 1262 // CControlInputWidget::SetCursorPosition … … 1250 1267 { 1251 1268 CWebKitView* webkitView = static_cast<CWebKitView*>(iParent); 1252 CWebKitCursor* cur = webkitView->Cursor(); 1253 if ( !cur ) 1254 { 1255 return; 1256 } 1257 TPoint pos = cur->Position(); 1258 TInt fontGap = iFont.FontLineGap(); 1259 TInt lineNumber = 0; 1260 1261 if(fontGap) 1262 { 1263 lineNumber = (pos.iY - aInitialRectangle.iTl.iY) / fontGap; //iFont.HeightInPixels(); 1264 } 1269 TPoint pos = webkitView->Cursor()->Position(); 1270 1271 TInt const lineNumber = (pos.iY - aInitialRectangle.iTl.iY) / iFont.FontLineGap(); //iFont.HeightInPixels(); 1265 1272 1266 1273 if(lineNumber) … … 1281 1288 else 1282 1289 { 1283 TRect rect = iEditor->Rect(); 1284 TInt nCharAtPos = iFont.TextCount(aText, pos.iX - rect.iTl.iX); 1290 TInt nCharAtPos = iFont.TextCount(aText, pos.iX); 1285 1291 iEditor->SetCursorPosL(nCharAtPos, EFalse); 1286 1292 iLastCurPos = nCharAtPos; … … 1333 1339 } 1334 1340 } 1341 #endif 1335 1342 // End of File -
S60/branches/3.1m/WebKit/ChangeLog
r19731 r19774 1 brmorris, reviewed by Sachin. 2 DESC: r19404 caused some regresion, so I'm reverting it. TMCN-6XYSLY 3 This was a fix for Enhanced Input feature not working in 3.1 4 http://bugs.webkit.org/show_bug.cgi?id=12533 5 1 6 yadavall, Reviewed by Zalan Bujtas (zbujtas@gmail.com). 2 7 DESC: Browser crashes when trying to open rss link hs.fi/rss HMNN-6YDEAW
Note: See TracChangeset
for help on using the changeset viewer.