FCL/sf/mw/classicui: comparison uifw/AvKon/src/AknCharMap.cpp

equal deleted inserted replaced

-:85902f042028
+:a5e7a4f63858
 TBool IsEmotionEnabled() const;
 TBool IsShowingEmotion() const;
 void SwitchEmotionVisibilityL();
 TBool NeedEmotionSwitchIcon() const;
 HBufC* ReadEmotionHBufCL();
-void LoadEmotionTumbnails(const TDesC& aText);
+void LoadEmotionTumbnails(const TDesC& aChars);
-void PlayAnimationL(const TDesC& aText);
-void StopAnimation(const TDesC& aText);
 void SetEmotionSize(const TSize& aSize);
 TBool IsEmotionChar(TChar aChar);
 TChar SwitchToSctChar();
 TChar SwitchToEmotionChar();
 CAknSmileyIcon* EmotionIcon(TChar aChar);
 // Whether or not kinetic scrolling is enabled in the device.
 // Focus scrolling is disabled if kinetic scrolling is used.
 TBool iKineticScrolling;
 // Indicates whether menu sct is highlighted or not.
 TBool iMenuSctHighlighted;
-// flag for focus status of char map dialog
-TBool iCharMapFocusGained;
 public: // for Emotion
 HBufC* iCharsSmiley;
 CSmileyModel* iSmileyModel;
 TChar iLastFocusedSmileyChar;
 }
 return charsSmiley;
 }
-void CAknCharMapExtension::LoadEmotionTumbnails(const TDesC& aText)
+void CAknCharMapExtension::LoadEmotionTumbnails(const TDesC& aChars)
 {
 //If emotion tumbbails can't be load,
 // no emotion tumbnail will be dispalyed.
-TRAP_IGNORE( iSmileyModel->LoadStillImagesL(aText) );
+TRAP_IGNORE( iSmileyModel->LoadStillImagesL(aChars) );
-}
-const TInt KAnimationRepeat = 30;
-const TInt KAnimationDelay = 150*1000;
-void CAknCharMapExtension::PlayAnimationL(const TDesC& aText)
-{
-iSmileyModel->PlayAnimationL(aText, KAnimationRepeat, KAnimationDelay);
-}
-void CAknCharMapExtension::StopAnimation(const TDesC& aText)
-{
-iSmileyModel->StopAnimation(aText);
 }
 void CAknCharMapExtension::SetEmotionSize(const TSize& aSize)
 {
 TInt unit = Min(aSize.iWidth, aSize.iHeight);
 iSBFrame->SetScrollBarVisibilityL(CEikScrollBarFrame::EOff,CEikScrollBarFrame::EAuto);
 iSBFrame->VerticalScrollBar()->SetMopParent(iExtension);
 UpdateScrollIndicatorL();
 }
-Extension()->LoadEmotionTumbnails(*iChars);
+iExtension->LoadEmotionTumbnails(*iChars);
+SetSmileyAnimationActivityInCurrentPageL(ETrue);
 }
 EXPORT_C void CAknCharMap::SetBuffer(TDes& aSpecialChars)
 {
 iOffscreenBgDrawn = EFalse;
 }
 else if(aType == KEikMessageFadeAllWindows) // focus gained // KEikMessageWindowsFadeChange
 {
-Extension()->iCharMapFocusGained = ETrue;
 SetSmileyAnimationActivityInCurrentPageL(ETrue);
 }
 else if(aType == KAknMessageFocusLost) // focus lost
 {
-Extension()->iCharMapFocusGained = EFalse;
 SetSmileyAnimationActivityInCurrentPageL(EFalse);
 if ( iExtension->iHighlightVisible )
 {
 iExtension->iHighlightVisible = EFalse;
 cc = AknsDrawUtils::ControlContext( this );
 }
 TPoint pos = iGridTopLeft;
 TSize size(iGridItemWidth*iMaxColumns+1, iGridItemHeight);
-// eliminate the overlap area between menu sct and the first menu item.
+	// eliminate the overlap area between menu sct and the first menu item.
 if ( Extension()->iMenuSct )
 {
 // provide a dirty fix for Menu SCT, since Layout data is not suitable for this
 size = TSize( Rect().Width()- 1, iGridItemHeight - 1 );
 }
 if(iIsMirrored)
 {
 pos.iX += iGridItemWidth - size.iWidth;
 }
 AknLayoutScalable_Avkon::cell_graphic_popup_pane_cp2(0,0,0));
 TAknLayoutRect rightCellLayRect;
 rightCellLayRect.LayoutRect(gridRect,
 AknLayoutScalable_Avkon::cell_graphic_popup_pane_cp2(0,1,0));
 TRect firstCellRect;
-// Cell width.
+		// Cell width.
 iGridItemWidth =
 rightCellLayRect.Rect().iTl.iX - firstCellLayRect.Rect().iTl.iX;
 if (iGridItemWidth < 0)
 {
 iGridItemWidth = -iGridItemWidth;
 }
 if ( Extension()->iMenuSct )
 {
 firstCellRect = TRect( TPoint(0, 0),
 TSize( iGridItemWidth, Rect().Height() ) );
 }
 else
 {
 firstCellRect = firstCellLayRect.Rect();
 }
 TInt firstVisibleIndex = iFirstVisibleRow * iMaxColumns;
 // Max columns.
 iMaxColumns = gridRect.Width() / firstCellRect.Width();
 iFirstVisibleRow = firstVisibleIndex / iMaxColumns;
 TInt resourceId = R_AVKON_MENU_SCT_ROW_DEFAULT_CONTENTS;
 if (FeatureManager::FeatureSupported(KFeatureIdChinese))
 {
 resourceId = R_AVKON_MENU_SCT_ROW_DEFAULT_CONTENTS_CHINESE;
 }
-else if (FeatureManager::FeatureSupported(KFeatureIdKorean))
-{
-// Added korea character support
-resourceId = R_AVKON_MENU_SCT_ROW_DEFAULT_CONTENTS_KOREAN;
-}
 CCoeEnv::Static()->CreateResourceReaderLC( reader, resourceId );
 ConstructFromResourceL( reader );
 CleanupStack::PopAndDestroy();
 }
 default:
 break;
 }
 CAknCharMapHistory::THistoryFilter historyFilter;
-if(Extension()->IsEmotionEnabled())
+if(iExtension->IsEmotionEnabled())
 {
 historyFilter = CAknCharMapHistory::EHistoryFilterMixed;
 }
 else
 {
 iCursorPos = TPoint(0, 0);
 }
 iExtension->iFlags |= EAknCharMapCharsAllocated; // mark that iChars points to HBufC
 }
-Extension()->LoadEmotionTumbnails(*iChars);
+iExtension->LoadEmotionTumbnails(*iChars);
-// control will never get focus event while it is in EditMenu mode
-Extension()->iCharMapFocusGained = ETrue;
 // The "PlayAnimationL" in "SetSmileyAnimationActivityInCurrentPageL"
 // will leave. If we ignore it, just no animation is played.
 TRAP_IGNORE( SetSmileyAnimationActivityInCurrentPageL(ETrue) );
 }
 return EFalse;
 }
 TBool CAknCharMap::IsJapaneseSctUi() const
 {
-//Japanese feature for SCT will not be supported since TB9.2 PS2,
-//so it always return EFalse.
 return EFalse;
 }
-TBool CAknCharMap::IsKoreanSctUi() const
-{
-	// Korean feature dropped half-screen SCT in 9.2, it has the same
-	//   behavior with others, so return false here
-return EFalse;
-}
 // -----------------------------------------------------------------------------
 // CAknCharMap::TitleWithSelectingSpecialChar()
 // Return the title string with the selecting special characters
 // -----------------------------------------------------------------------------
 //
 DrawCell(index, highlighted);
 }
 }
 }
+const TInt KAnimationRepeat = 30;
+const TInt KAnimationDelay = 1000*1000;
 void CAknCharMap::SetSmileyAnimationActivityInCurrentPageL(TBool aIsActive)
 {
-TInt pos = iFirstVisibleRow * iMaxColumns;
+TInt begin = iFirstVisibleRow * iMaxColumns;
-TInt maxLength = iChars->Length() - pos;
+TInt end = iExtension->iMaxVisibleRows * iMaxColumns + begin;
-TInt length = iExtension->iMaxVisibleRows * iMaxColumns;
+if( end > iChars->Length() )
-if(length > maxLength) length = maxLength;
+{
+end = iChars->Length();
-const TPtrC textInCurrentPage = iChars->Mid(pos, length);
+}
-if(Extension()->iCharMapFocusGained && aIsActive)
+for( TInt i(begin); i<end; i++ )
 {
-Extension()->PlayAnimationL(textInCurrentPage);
+TChar code = (*iChars)[i];
-}
+CAknSmileyIcon* icon = iExtension->EmotionIcon(code);
-else
+if( !icon )
 {
-Extension()->StopAnimation(textInCurrentPage);
+continue;
+}
+if( ( aIsActive ) &&
+( Extension()->IsShowingEmotion() || Extension()->iMenuSctHighlighted)
+)
+{
+icon->PlayAnimationL( KAnimationRepeat, KAnimationDelay );
+}
+else
+{
+icon->StopAnimation();
+}
 }
 }
 void CAknCharMap::GetFocusSctName(TChar& aChar, TDes& aName) const
 {

branch	RCL_3
changeset 72	a5e7a4f63858
parent 64	85902f042028