Changeset 21189 for S60/trunk/WebKit

Show
Ignore:
Timestamp:
04/30/07 07:35:30 (21 months ago)
Author:
yongjzha
Message:

raalexan, reviewed by Yongjun

DESC: can't do the chinese keyword searching on the brower
http://bugs.webkit.org/show_bug.cgi?id=13418
TSW ID: RLEA-6ZFCBF

  • BrowserCore/Formcontrols/inc/FControlInputSkin.h:
  • BrowserCore/Formcontrols/src/FControlInputSkin.cpp: (CFormInputSkin::SelectedLanguage):
  • BrowserCore/Formcontrols/src/FControlInputWidget.cpp: (CControlInputWidget::OfferKeyEventL):
Location:
S60/trunk/WebKit
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • S60/trunk/WebKit/BrowserCore/Formcontrols/inc/FControlInputSkin.h

    r18812 r21189  
    108108    virtual void HandlePointerEventL( const TPointerEvent& aPointerEvent ) = 0; 
    109109 
     110    /** 
     111    * This function is called when the user navigate left/right out the widget (some languages pops up a list) 
     112    */ 
     113    virtual TBool SelectedLanguage() = 0; 
     114 
    110115  }; 
    111116 
    … …  
    470475    */ 
    471476    void SetDisabled(TBool aDisabled) { iDisabled = aDisabled; } 
     477 
     478    /** 
     479    * Returns the selected language 
     480    * @since 3.1 
     481    * @return TBool 
     482    */ 
     483    TBool SelectedLanguage(); 
    472484     
    473485  public: 

  • S60/trunk/WebKit/BrowserCore/Formcontrols/src/FControlInputSkin.cpp

    r19406 r21189  
    727727 
    728728//----------------------------------------------------------------------------- 
     729// CFormInputSkin::SelectedLanguage() - check for selected input language 
     730//----------------------------------------------------------------------------- 
     731TBool CFormInputSkin::SelectedLanguage() 
     732    { 
     733    TBool selected = ETrue; 
     734    CAknSettingCache& cache = CAknEnv::Static()->SettingCache(); 
     735    TLanguage lang = cache.InputLanguage(); 
     736    if(lang == ELangPrcChinese || lang == ELangHongKongChinese || lang == ELangTaiwanChinese) 
     737        selected = EFalse; 
     738    return selected; 
     739    } 
    729740// CFormInputSkin::Activate- activates the control 
    730741//----------------------------------------------------------------------------- 

  • S60/trunk/WebKit/BrowserCore/Formcontrols/src/FControlInputWidget.cpp

    r19424 r21189  
    560560        iLastCurPos == iEditor->ReadableTextL()->Length()) ||  
    561561         (aKeyEvent.iScanCode == EStdKeyLeftArrow && CurPos() == iEditor->ReadableTextL()->Length() && 
    562          iLastCurPos == 0))) 
     562         iLastCurPos == 0)) && iListener->SelectedLanguage()) 
    563563        { 
    564564        SetWebKitCursorPosition(aKeyEvent); 

  • S60/trunk/WebKit/ChangeLog

    r21150 r21189  
     1raalexan, reviewed by Yongjun 
     2        DESC: can't do the chinese keyword searching on the brower 
     3        http://bugs.webkit.org/show_bug.cgi?id=13418 
     4        TSW ID: RLEA-6ZFCBF 
     5 
     6        * BrowserCore/Formcontrols/inc/FControlInputSkin.h: 
     7        * BrowserCore/Formcontrols/src/FControlInputSkin.cpp: 
     8        (CFormInputSkin::SelectedLanguage): 
     9        * BrowserCore/Formcontrols/src/FControlInputWidget.cpp: 
     10        (CControlInputWidget::OfferKeyEventL): 
     11 
    112rathnasa, reviewed by zbujtas 
    213 DESC: Widget Menu API