FCL/sf/mw/inputmethods: comparison textinput/peninputfingerhwrar/src/peninputfingerhwrarlayout.cpp

equal deleted inserted replaced

-:f5a1e66df979
+:a47de9135b21
 //SYSTEM INCLUDES
 #include <bautils.h>
 #include <coemain.h>
 //FEP Includes
-#include <AknFepGlobalEnums.h>
+#include <aknfepglobalenums.h>
 #include <aknfeppeninputenums.h>
 #include <peninputlayoutchoicelist.h>
 #include <settingsinternalcrkeys.h>
 #include <centralrepository.h>
 #include <peninputlayoutvkb.h>
-#include <AknFepGlobalEnums.h>
 #include <peninputcmdparam.h>
 #include <peninputdropdownlist.h>
 #include <peninputlayoutmultilineicf.h>
 //USER INCLUDES
 break;
 case ECmdPenInputPermittedRange:
 {
 TInt ranges = *(TInt*)aData;
 iDataStore->SetPermittedRanges( ranges );
-iHwrWnd->SetPermittedRanges( ranges );
 ret = KErrNone;
 }
 break;
 case ECmdPenInputLanguage:
 {
 TRect hwrRect = iHwrWnd->WritingBoxRect();
 TSize hwrSize = hwrRect.Size();
 iDataStore->SetInputAreaSize(hwrSize);
 iDataStore->SetScreenSize(hwrSize);
-ChangeCurStateManagerToStandby();
+ChangeCurStateToStandby();
 iDataStore->GetKeyboardType();
 iDataStore->SetKeyboardToQwerty();
 ret = KErrNone;
 }
 				}
 			else if(iDataStore->IsArabicNumber(charBeforeCursor)) // arabic-indic numbers
 				{
 				candtype = ECandArabicIndicNumFirst;
 				}
-			else if(iDataStore->IsArabicChar(charBeforeCursor))
-			    {
-			    candtype = ECandArabicCharFirst;
-			    }
 			iDataStore->SetFirstCandidateType(candtype);
 			}
 return err;
 }
 // Called by owner when the layout is going to be hidden.
 // ---------------------------------------------------------------------------
 //
 void CPeninputFingerHwrArLayout::OnDeActivate()
 {
-//cancel writing
+// cancel writing
 iHwrWnd->CancelWriting();
-if(!iHwrWnd->IsSymbolTableShowingUp())
+	// close the symbol table if it's showing up
-{
+iHwrWnd->CloseSymbolTable();
-iHwrWnd->UpdateLayout( ETrue );
-}
+	// close the candidate list if it's showing up
+iHwrWnd->CloseCandidateList();
 CFepUiLayout::OnDeActivate();
 }
 // ---------------------------------------------------------------------------
 }
 break;
 case EHwrEventOutsideEvent:
 {
-ChangeCurStateManagerToStandby();
+ChangeCurStateToStandby();
 iHwrWnd->CloseSymbolTable();
 }
 break;
 default:
 self->SetBoxPenColor( newValue );
 }
 break;
 case KSettingsPenInputGuideLine:
 {
+self->SetGuideLineOn(newValue);
 }
 break;
 default:
 break;
 }
 CPeninputFingerHwrArLayout::~CPeninputFingerHwrArLayout()
 {
 CCoeEnv::Static()->DeleteResourceFile( iResId );
 delete iDataStore;
-iStateMgrArray.ResetAndDestroy();
+	delete iStateMgr;
-iStateMgrArray.Close();
 delete iGSRepositoryWatcher;
 delete iRepositorySetting;
 }
 // ---------------------------------------------------------------------------
 // Create the state manager.
 // ---------------------------------------------------------------------------
 //
 void CPeninputFingerHwrArLayout::CreateStateManagerL()
 {
-iStateMgrArray.AppendL( CPeninputFingerHwrArStateManager::NewL( this ) );
+iStateMgr = CPeninputFingerHwrArStateManager::NewL( this );
 }
 // ---------------------------------------------------------------------------
 // handler of button down event.
 // ---------------------------------------------------------------------------
 // Go to standby when button up before character timeout
 if ( iDataStore->StartCharacter())
 {
 iDataStore->SetStartCharacter(EFalse);
 iHwrWnd->CancelWriting();
-ChangeCurStateManagerToStandby();
+ChangeCurStateToStandby();
-iHwrWnd->UpdateLayout( ETrue );
+iHwrWnd->CloseCandidateList();
 }
 SignalOwner( ESignalLayoutClosed );
 }
 break;
 // Go to standby when button up before character timeout
 if ( iDataStore->StartCharacter())
 {
 iDataStore->SetStartCharacter(EFalse);
 iHwrWnd->CancelWriting();
-ChangeCurStateManagerToStandby();
+ChangeCurStateToStandby();
-iHwrWnd->UpdateLayout( ETrue );
+iHwrWnd->CloseCandidateList();
 }
 if(iHwrWnd->IsSymbolTableShowingUp())
 	{
 iHwrWnd->CloseSymbolTable();
 }
 else
 {
-ChangeCurStateManagerToStandby();
+ChangeCurStateToStandby();
 iHwrWnd->OpenSymbolTable();
 }
 }
 break;
 case EHwrCtrlId3Page1Btn:
 {
-iHwrWnd->ShowSctPage( 1, EPagePosPageNo );
+iHwrWnd->ShowSymbolPage( 1, EPagePosPageNo );
 }
 break;
 case EHwrCtrlId3Page2Btn:
 {
-iHwrWnd->ShowSctPage( 2, EPagePosPageNo );
+iHwrWnd->ShowSymbolPage( 2, EPagePosPageNo );
 }
 break;
 case EHwrCtrlId3Page3Btn:
 {
-iHwrWnd->ShowSctPage( 0, EPagePosPageNo );
+iHwrWnd->ShowSymbolPage( 0, EPagePosPageNo );
 }
 break;
 case EHwrCtrlId2Page1Btn:
 {
-iHwrWnd->ShowSctPage( 1, EPagePosPageNo );
+iHwrWnd->ShowSymbolPage( 1, EPagePosPageNo );
 }
 break;
 case EHwrCtrlId2Page2Btn:
 {
-iHwrWnd->ShowSctPage( 0, EPagePosPageNo );
+iHwrWnd->ShowSymbolPage( 0, EPagePosPageNo );
 }
 break;
 		case EHwrCtrlIdBtnEnter:
 {
 			TBuf<1> bufEnter;
 	iHwrWnd->CancelWriting();
 if (iHwrWnd->IsCandidateShowup())
 {
 // goto standby and clear screen
 iDataStore->SetStartCharacter(EFalse);
-		ChangeCurStateManagerToStandby();
+		ChangeCurStateToStandby();
-	    iHwrWnd->UpdateLayout( ETrue );
+	    iHwrWnd->CloseCandidateList();
 }
 else
 {
 SubmitCharToFep( EKeyBackspace );
-CurStateManager()->HandleEventL( EHwrEventKeyBack, KNullDesC );
+iStateMgr->HandleEventL( EHwrEventKeyBack, KNullDesC );
 		if(iDataStore->StartCharacter())
 		    {
-			ChangeCurStateManagerToStandby();
+			ChangeCurStateToStandby();
-		    iHwrWnd->UpdateLayout( ETrue );
+		    iHwrWnd->CloseCandidateList();;
 			}
 }
 }
 // ---------------------------------------------------------------------------
 if ( !aCtrl )
 {
 return;
 }
-CurStateManager()->HandleEventL( EHwrEventCandidateSelected, aData );
+iStateMgr->HandleEventL( EHwrEventCandidateSelected, aData );
+ChangeCurStateToStandby();
-ChangeCurStateManagerToStandby();
+iHwrWnd->CloseCandidateList();;
-iHwrWnd->UpdateLayout( ETrue );
 }
 // ---------------------------------------------------------------------------
 // clicked event handler of icf.
 // ---------------------------------------------------------------------------
 //
 void CPeninputFingerHwrArLayout::OnIcfClicked()
 {
 // Go to standby
-	ChangeCurStateManagerToStandby();
+	ChangeCurStateToStandby();
-	iHwrWnd->UpdateLayout( ETrue );
+	if(iHwrWnd->IsCandidateShowup())
+	    {
+		iHwrWnd->CloseCandidateList();
+		}
 	}
 // ---------------------------------------------------------------------------
 // handler of StrokeStarted event.
 // ---------------------------------------------------------------------------
 //
 void CPeninputFingerHwrArLayout::OnHwrStrokeStartedL()
 {
 	iHwrWnd->HideIndicator();
 	// The default candidate cell is not highlight
 	iDataStore->SetHighlight(EFalse);
-	iHwrWnd->UpdateLayout(ETrue);
+// close the candidate list if it's currently showing up
+	if(iHwrWnd->IsCandidateShowup())
+	    {
+		iHwrWnd->CloseCandidateList();
+		}
 	// remember the start writing position.
 iDataStore->SetStartCharacter(ETrue);
-CurStateManager()->HandleEventL( EEventHwrStrokeStarted, KNullDesC );
+iStateMgr->HandleEventL( EEventHwrStrokeStarted, KNullDesC );
 }
 // ---------------------------------------------------------------------------
 // handler of StrokeFinished event.
 // ---------------------------------------------------------------------------
 void CPeninputFingerHwrArLayout::OnHwrStrokeFinishedL()
 {
 RArray<TPoint> points = iHwrWnd->StrokeList();
 TPtrC ptr;
 ptr.Set(reinterpret_cast<TText*>(&points), sizeof(&points));
-CurStateManager()->HandleEventL( EEventHwrStrokeFinished, ptr );
+iStateMgr->HandleEventL( EEventHwrStrokeFinished, ptr );
 }
 // ---------------------------------------------------------------------------
 // handler of CharacterFinished event.
 // ---------------------------------------------------------------------------
 iDataStore->SetStartCharacter( EFalse );
 RArray<TPoint> points = iHwrWnd->StrokeList();
 TPtrC ptr;
 ptr.Set( reinterpret_cast<TText*>( &points ), sizeof(&points) );
-CurStateManager()->HandleEventL( EEventHwrCharacterTimerOut, ptr );
+iStateMgr->HandleEventL( EEventHwrCharacterTimerOut, ptr );
-// When recognize Enter or Backspace, it will go to standby
+	iHwrWnd->OpenCandidateList();
-iHwrWnd->UpdateLayout( CurStateManager()->IsStandbyState(), ETrue);
+	}
-}
 // ---------------------------------------------------------------------------
 // get value from repository.
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 // set hwr writing pen color.
 // ---------------------------------------------------------------------------
 //
-void CPeninputFingerHwrArLayout::SetGuideLineOn(const TBool aGuideLineOn)
+void CPeninputFingerHwrArLayout::SetGuideLineOn(TBool aGuideLineOn)
 {
 iHwrWnd->SetGuideLineOn( aGuideLineOn );
 }
 // ---------------------------------------------------------------------------
-// get current state manager.
-// ---------------------------------------------------------------------------
-//
-CPeninputFingerHwrArStateManagerBase* CPeninputFingerHwrArLayout::CurStateManager()
-{
-return iStateMgrArray[0];
-}
-// ---------------------------------------------------------------------------
 // change current state manager to standby state.
 // ---------------------------------------------------------------------------
 //
-void CPeninputFingerHwrArLayout::ChangeCurStateManagerToStandby()
+void CPeninputFingerHwrArLayout::ChangeCurStateToStandby()
 {
-CPeninputFingerHwrArStateManagerBase* stateMgr = CurStateManager();
+iStateMgr->SetState( CPeninputFingerHwrArStateManagerBase::EStateStandBy );
-if ( stateMgr )
-{
-stateMgr->SetState( CPeninputFingerHwrArStateManagerBase::EStateStandBy );
-}
 }
 //End of file

branch	RCL_3
changeset 7	a47de9135b21
parent 3	f5a1e66df979
child 8	6ceef9a83b1a