MCL/sf/mw/inputmethods: comparison textinput/peninputgenericitut/src/peninputgenericitutlayout.cpp

equal deleted inserted replaced

-:5e18d8c489d6
+:6c2c2d3ab788
 switch(aCmd)
 {
 case ECmdPenInputLanguage:
 {
 TRAP_IGNORE(SetInputLanguageL(*data));
 }
 break;
 case ECmdPenInputRange:
 	{
 	iDataMgr->SetLatinOnly( *data );
 }
 break;
 case ECmdPenInputFingerSpelling:
 {
-if (UiMgr())
+if ( iWesternUiMgr )
 {
 TInt handled = KErrNone;
-TRAP_IGNORE(handled = UiMgr()->HandleCommandL(aCmd, aData));
+TRAP_IGNORE( handled = iWesternUiMgr->HandleCommandL( aCmd, aData ));
 return handled;
 }
 }
 break;
 case ECmdPenInputFingerMatchList:
 return iCurrentUiMgr;
 }
 void CGenericItutUiLayout::SetInputModeL(TInt aMode)
 {
-		TBool numericOnlyChanged = iDataMgr->IsCharFlagChanged() ? ETrue : EFalse;
+	// Input mode can not be set to EnativeNumber in Thai
-		//only number mode need judge it
+TInt inputLanguage = iDataMgr->InputLanguage();
+if ( aMode ==  ENativeNumber && inputLanguage == ELangThai )
-		//  both EStrokeFind and EStroke will be stored as Estroke  /////
+{
-		if ( aMode != iDataMgr->InputMode() ||
+aMode = ENumber;
-			 aMode == EStroke || aMode == EStrokeFind ||
+}
-			 aMode == EZhuyin || aMode == EZhuyinFind ||
-			 numericOnlyChanged )
+TBool numericOnlyChanged = iDataMgr->IsCharFlagChanged() ? ETrue : EFalse;
+//only number mode need judge it
+//  both EStrokeFind and EStroke will be stored as Estroke  /////
+if ( aMode != iDataMgr->InputMode() ||
+aMode == EStroke || aMode == EStrokeFind ||
+aMode == EZhuyin || aMode == EZhuyinFind ||
+numericOnlyChanged )
 {
 // deactivate original uimgr first
 if (iCurrentUiMgr
 && iCurrentUiMgr->CurrentState()
 && iCurrentUiMgr->CurrentState()->StateType() != CGenericItutUiMgrBase::EStateSpelling)

branch	RCL_3
changeset 15	6c2c2d3ab788
parent 7	6defe5d1bd39
child 19	ac7e4d1d9209