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

equal deleted inserted replaced

-:a1caeb42b3a3
+:fcdfafb36fe7
 TBool IsEmotionEnabled() const;
 TBool IsShowingEmotion() const;
 void SwitchEmotionVisibilityL();
 TBool NeedEmotionSwitchIcon() const;
 HBufC* ReadEmotionHBufCL();
-void LoadEmotionTumbnails(const TDesC& aChars);
+void LoadEmotionTumbnails(const TDesC& aText);
+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;
 if ( !emotionEnabled )
 {
 // start complex dynamic logic to locate title rect when emotion is unable
 TInt orientation = mirrored ? -1 : 1;
 TInt newLeft = titleRect.iTl.iX + orientation*rect.Width()/2;
-TPoint titleTL( newLeft, titleRect.iTl.iY );
+TPoint titlePoint( newLeft, titleRect.iTl.iY );
-titleRect.SetRect( titleTL, titleRect.Size() );
+titleRect.SetRect( titlePoint, titleRect.Size() );
 }
 AknLayoutUtils::LayoutLabel(iTitle, titleRect, textlayout.LayoutLine());
 // Page text color
 TAknLayoutText textLayout;
 }
 return charsSmiley;
 }
-void CAknCharMapExtension::LoadEmotionTumbnails(const TDesC& aChars)
+void CAknCharMapExtension::LoadEmotionTumbnails(const TDesC& aText)
 {
 //If emotion tumbbails can't be load,
 // no emotion tumbnail will be dispalyed.
-TRAP_IGNORE( iSmileyModel->LoadStillImagesL(aChars) );
+TRAP_IGNORE( iSmileyModel->LoadStillImagesL(aText) );
+}
+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);
 else
 {
 iShowCasesRef = &iSpecialCharCases;
 iShowPagesRef = &iSpecialCharPages;
-// default
-iSpecialCharCase = EAknSCTLowerCase;
-iChars = iCharsBufferLower;
 if(iExtension->iCharsSmiley && iExtension->IsShowingEmotion())
 {
 iChars = iExtension->iCharsSmiley;
 }
 else if (iCharsBufferUpper && iSpecialCharCase==EAknSCTUpperCase)
 iChars = iCharsBufferHalf;
 }
 else if (iExtension->iCharsQwerty && iSpecialCharCase==EAknSCTQwerty)
 {
 iChars = iExtension->iCharsQwerty;
+}
+else
+{
+iSpecialCharCase = EAknSCTLowerCase;
+iChars = iCharsBufferLower;
 }
 }
 // calculate page count for all pages
 iSpecialCharPages.Reset(); // reset the current page count for different charsets
 iSBFrame->SetScrollBarVisibilityL(CEikScrollBarFrame::EOff,CEikScrollBarFrame::EAuto);
 iSBFrame->VerticalScrollBar()->SetMopParent(iExtension);
 UpdateScrollIndicatorL();
 }
-iExtension->LoadEmotionTumbnails(*iChars);
+Extension()->LoadEmotionTumbnails(*iChars);
-SetSmileyAnimationActivityInCurrentPageL(ETrue);
 }
 EXPORT_C void CAknCharMap::SetBuffer(TDes& aSpecialChars)
 {
 code == EKeyLeftArrow || code == EKeyRightArrow ||
 code == EKeyEnter )
 {
 iExtension->iKeyBrdEvent = ETrue;
 iExtension->iHighlightVisible = ETrue;
-iCursorPos = TPoint( 0, 0 );
+if ( LengthOfRecentChar() == 0 && CurrentPage() == 1 )
+	{
+iCursorPos = TPoint( 0, 1 );
+	}
+else
+	{
+iCursorPos = TPoint( 0, 0 );
+	}
 DrawCursor();
 return EKeyWasConsumed;
 }
 }
 if (recentWasSetBeforeSwitch) AppendRecentCharL();
 // Sets the character case because the buffer content may have changed.
 SetCharacterCaseL(iSpecialCharCase);
-SetSmileyAnimationActivityInCurrentPageL(ETrue);
 TInt cursorIndexAfterSwitch;
 if ( !iExtension->iKeyBrdEvent )
 {
 cursorIndexAfterSwitch = cursorIndexBeforeSwitch;
 }
 }
 }
 // the new first row is the top row on the page where the new focus is.
 TInt pageVolume = iMaxColumns * iExtension->iMaxVisibleRows;
 iFirstVisibleRow = (cursorIndexAfterSwitch / pageVolume * pageVolume) / iMaxColumns;
+SetSmileyAnimationActivityInCurrentPageL(ETrue);
 // the cursor positions are relative to current page
 TInt cursorIndexAfterSwitchInPage = cursorIndexAfterSwitch - (iMaxColumns * iFirstVisibleRow);
 iCursorPos.iX = cursorIndexAfterSwitchInPage % iMaxColumns;
 iCursorPos.iY = cursorIndexAfterSwitchInPage / iMaxColumns;
 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);
-if(iIsMirrored)
-{
-pos.iX += iGridItemWidth - size.iWidth;
-}
 // eliminate the overlap area between menu sct and the first menu item.
 if ( Extension()->iMenuSct )
 {
-size.iHeight--;
+// 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;
 }
 AknsDrawUtils::Background(skin, cc, this, aGc, TRect(pos,size));
 SetRecentCharFrameStyle(aGc);
 TAknLayoutRect firstCellLayRect;
 firstCellLayRect.LayoutRect(gridRect,
 AknLayoutScalable_Avkon::cell_graphic_popup_pane_cp2(0,0,0));
-TRect firstCellRect;
-if ( Extension()->iMenuSct )
-{
-firstCellRect = TRect( TPoint(0, 0),
-TSize( firstCellLayRect.Rect().Width(), Rect().Height() ) );
-}
-else
-{
-firstCellRect = firstCellLayRect.Rect();
-}
 TAknLayoutRect rightCellLayRect;
 rightCellLayRect.LayoutRect(gridRect,
 AknLayoutScalable_Avkon::cell_graphic_popup_pane_cp2(0,1,0));
+TRect firstCellRect;
+// 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;
 // Max visible rows.
 iExtension->iMaxVisibleRows = gridRect.Height() / firstCellRect.Height();
-// Cell width.
-iGridItemWidth =
-rightCellLayRect.Rect().iTl.iX - firstCellLayRect.Rect().iTl.iX;
-if (iGridItemWidth < 0)
-{
-iGridItemWidth = -iGridItemWidth;
-}
 // Cell height.
 if ( Extension()->iMenuSct )
 {
 iGridItemHeight = firstCellRect.Height();
 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(iExtension->IsEmotionEnabled())
+if(Extension()->IsEmotionEnabled())
 {
 historyFilter = CAknCharMapHistory::EHistoryFilterMixed;
 }
 else
 {
 }
 else
 {
 iShowCasesRef = &iSpecialCharCases;
 iShowPagesRef = &iSpecialCharPages;
-iChars = iCharsBufferLower;
 if (iCharsBufferUpper && iSpecialCharCase==EAknSCTUpperCase)
+{
 iChars = iCharsBufferUpper;
+}
 else if (iCharsBufferNumeric && iSpecialCharCase==EAknSCTNumeric)
+{
 iChars = iCharsBufferNumeric;
+}
 else if (iCharsBufferFull && iSpecialCharCase==EAknSCTFullCase)
+{
 iChars = iCharsBufferFull;
+}
 else if (iCharsBufferHalf && iSpecialCharCase==EAknSCTHalfCase)
+{
 iChars = iCharsBufferHalf;
+}
 else if (iExtension->iCharsQwerty && iSpecialCharCase==EAknSCTQwerty)
+{
 iChars = iExtension->iCharsQwerty;
+}
-if(iChars == iCharsBufferLower)
+else
 {
+// default
 iSpecialCharCase = EAknSCTLowerCase;
+iChars = iCharsBufferLower;
 }
 }
 // mark that iChars doesn't point to HBufC
 iExtension->iFlags &= (~EAknCharMapCharsAllocated);
 }
 iCursorPos = TPoint(0, 0);
 }
 iExtension->iFlags |= EAknCharMapCharsAllocated; // mark that iChars points to HBufC
 }
-iExtension->LoadEmotionTumbnails(*iChars);
+Extension()->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
+{
+return FeatureManager::FeatureSupported( KFeatureIdKorean );
+}
 // -----------------------------------------------------------------------------
 // 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 begin = iFirstVisibleRow * iMaxColumns;
+TInt pos = iFirstVisibleRow * iMaxColumns;
-TInt end = iExtension->iMaxVisibleRows * iMaxColumns + begin;
+TInt maxLength = iChars->Length() - pos;
-if( end > iChars->Length() )
+TInt length = iExtension->iMaxVisibleRows * iMaxColumns;
-{
+if(length > maxLength) length = maxLength;
-end = iChars->Length();
-}
+const TPtrC textInCurrentPage = iChars->Mid(pos, length);
-for( TInt i(begin); i<end; i++ )
+if(Extension()->iCharMapFocusGained && aIsActive)
 {
-TChar code = (*iChars)[i];
+Extension()->PlayAnimationL(textInCurrentPage);
-CAknSmileyIcon* icon = iExtension->EmotionIcon(code);
+}
-if( !icon )
+else
 {
-continue;
+Extension()->StopAnimation(textInCurrentPage);
-}
-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 51	fcdfafb36fe7
parent 38	c52421ed5f07
child 55	aecbbf00d063