textinput/peninputgenericitut/src/peninputgenericitutwindowmanager.cpp
branchRCL_3
changeset 9 e6a39382bb9c
parent 8 4eb1ae11334f
child 11 c8fb4cf7b3ae
--- a/textinput/peninputgenericitut/src/peninputgenericitutwindowmanager.cpp	Wed Apr 14 16:18:34 2010 +0300
+++ b/textinput/peninputgenericitut/src/peninputgenericitutwindowmanager.cpp	Tue Apr 27 16:59:43 2010 +0300
@@ -479,27 +479,15 @@
         {
         if ( iDataMgr->IsPortraitWest() && (!iDataMgr->IsChineseSpellMode()))
             {
-			iWindow->Icf()->HideBubble();
+                  //iWindow->Icf()->HideBubble();
             iWindow->SetIndiWithTextFlag( ETrue );
             iWindow->IndiBubbleWithText();
-            
-            if ( iDataMgr->IndicatorData().iIndicatorImgID != 0 &&
-                 iDataMgr->IndicatorData().iIndicatorMaskID != 0 && 
-                 iDataMgr->IndicatorData().iIndicatorTextImgID != 0 &&
-                 iDataMgr->IndicatorData().iIndicatorTextMaskID != 0 )
-                {
-                iWindow->SetIndiBubbleImageL( 
-                        iDataMgr->IndicatorData().iIndicatorImgID,
-                        iDataMgr->IndicatorData().iIndicatorMaskID,
-                        iDataMgr->IndicatorData().iIndicatorTextImgID,
-                        iDataMgr->IndicatorData().iIndicatorTextMaskID);
-                }
             }
         else
-        	{
-			iWindow->Icf()->HideBubble();
-			iWindow->MsgBubbleForChinese();
-        	}
+            {
+                  //iWindow->Icf()->HideBubble();
+                  iWindow->MsgBubbleForChinese();
+            }
         iWindow->Icf()->ShowBubble(aInfo,iWindow->Icf()->MsgBubbleCtrl()->Rect());
         }
     else
@@ -510,26 +498,14 @@
             }
         else
             {
-			if ( itutLayoutOwner->UiMgr()->CurrentState() &&
-			     itutLayoutOwner->UiMgr()->CurrentState()->StateType() !=
-			            CGenericItutUiMgrBase::EStateSpelling )
-				{
-				iWindow->Icf()->HideBubble();
-				iWindow->SetIndiWithTextFlag( EFalse );
-				iWindow->IndiBubbleWithoutText();
-				}
-				
-				if ( iDataMgr->IndicatorData().iIndicatorImgID != 0 &&
-					 iDataMgr->IndicatorData().iIndicatorMaskID != 0 && 
-					 iDataMgr->IndicatorData().iIndicatorTextImgID != 0 &&
-					 iDataMgr->IndicatorData().iIndicatorTextMaskID != 0 )
-					{
-					iWindow->SetIndiBubbleImageL( 
-							iDataMgr->IndicatorData().iIndicatorImgID,
-							iDataMgr->IndicatorData().iIndicatorMaskID,
-							iDataMgr->IndicatorData().iIndicatorTextImgID,
-							iDataMgr->IndicatorData().iIndicatorTextMaskID);
-					}
+                  if ( itutLayoutOwner->UiMgr()->CurrentState() &&
+                       itutLayoutOwner->UiMgr()->CurrentState()->StateType() !=
+                              CGenericItutUiMgrBase::EStateSpelling )
+                        {
+                        //iWindow->Icf()->HideBubble();
+                        iWindow->SetIndiWithTextFlag( EFalse );
+                        iWindow->IndiBubbleWithoutText();
+                        }
             
             iWindow->Icf()->ShowBubble( KEmptyString, 
                     iWindow->Icf()->MsgBubbleCtrl()->Rect());