diff -r 6defe5d1bd39 -r 4eb1ae11334f textinput/peninputgenericitut/src/peninputitutchnuistatestrokezhuyincomposition.cpp --- a/textinput/peninputgenericitut/src/peninputitutchnuistatestrokezhuyincomposition.cpp Wed Mar 31 22:08:20 2010 +0300 +++ b/textinput/peninputgenericitut/src/peninputitutchnuistatestrokezhuyincomposition.cpp Wed Apr 14 16:18:34 2010 +0300 @@ -29,6 +29,7 @@ #include "peninputgenericitutdatamgr.h" #include "peninputgenericitutlayoutcontext.h" #include "peninputgenericitutconverter.h" +#include "peninputgenericitutwindowmanager.h" CChnItutUiStateStrokeZhuyinComposition* CChnItutUiStateStrokeZhuyinComposition::NewL( CGenericItutUiMgrBase* aOwner) @@ -116,21 +117,12 @@ // hide dropdownlist & reset its status CFepCtrlDropdownList* candlist = static_cast(iOwner->LayoutContext()->Control(ECtrlIdStdCandsList)); - candlist->ResetAndClear(CFepCtrlDropdownList::EListExpandable); iOwner->DataMgr()->ClearChnCandidates(EItutCandidates); candlist->Hide(ETrue); CFepInputContextField* spellctrl = static_cast(iOwner->LayoutContext()->Control(ECtrlIdSpellICF)); - spellctrl->Hide(ETrue); - - //show indicator - iOwner->LayoutContext()->Control(ECtrlIdIndicator)->Hide(EFalse); - // Hide ICF, Backspace, Arrow contrls when exit to avoid flick - iOwner->LayoutContext()->Control(ECtrlIdICF)->Hide( ETrue ); - iOwner->LayoutContext()->Control(ECtrlIdBackspace)->Hide(ETrue); - iOwner->LayoutContext()->ShowArrowBtn(0); iOwner->DataMgr()->PtiEngine()->ClearCurrentWord(); } @@ -285,23 +277,29 @@ // consume star key at zhuyin composition state case EEventRawKeyDownEvent: { - const TKeyEvent *key = reinterpret_cast(aEventData.Ptr()); - - if (key->iScanCode == EStdKeyNkpAsterisk && iOwner->DataMgr()->InputMode() == EZhuyin) - { - HandleKeyL(ECmdPenInputFingerKeyPress, EPtiKeyStar); - return ETrue; - } + if ( iOwner->UiManager()->IsAllowHandleRawKeyEvent()) + { + const TKeyEvent *key = reinterpret_cast(aEventData.Ptr()); + + if (key->iScanCode == EStdKeyNkpAsterisk && iOwner->DataMgr()->InputMode() == EZhuyin) + { + HandleKeyL(ECmdPenInputFingerKeyPress, EPtiKeyStar); + return ETrue; + } + } } break; case EEventRawKeyUpEvent: { - const TKeyEvent *key = reinterpret_cast(aEventData.Ptr()); - - if (key->iScanCode == EStdKeyNkpAsterisk && iOwner->DataMgr()->InputMode() == EZhuyin) - { - return ETrue; - } + if ( iOwner->UiManager()->IsAllowHandleRawKeyEvent()) + { + const TKeyEvent *key = reinterpret_cast(aEventData.Ptr()); + + if (key->iScanCode == EStdKeyNkpAsterisk && iOwner->DataMgr()->InputMode() == EZhuyin) + { + return ETrue; + } + } } break; default: