FCL/sf/mw/inputmethods: comparison fep/aknfep/UiPlugins/AknFepUiInterface/AvkonImpl/src/AknFepUiAvkonCtrlCandidatePane.cpp

equal deleted inserted replaced

-:5a1685599b76
+:8152b1f1763a
 #include <eiklabel.h>
 #include <AknsDrawUtils.h>
 #include <AknBidiTextUtils.h>
 #include <AknsUtils.h>
 #include <AknIconUtils.h>
-#include <coecntrl.h>
 #include <aknfepuictrls.mbg>
-#include <skinlayout.cdl.h>
-#include <aknlayoutscalable_avkon.cdl.h>
 #include "AknFepUiInterfacePanic.h"
 #include "AknFepUIAvkonCtrlCandidatePane.h"
+#include "AknFepUIAvkonCtrlCandidateSelected.h"
 #include "aknfepchineseuidataconv.h"
 #include "aknfepuilayoutdatamgr.h"
-#include "AknFepUiInputStateBase.h"
-#include "AknFepUIAvkonCtrlCandidateCharacter.h"
 #include "data_caging_path_literals.hrh"
 const TInt CandidateCountLeft = 10;
-const TInt DibertHeight = 480;
-const TInt ShowAboveCharacter = -1;
-const TInt ShowBellowCharacter = 1;
 _LIT(KFepUiControlsBitmapFile, "aknfepuictrls.mbm");
-CAknFepUICtrlCandidatePane* CAknFepUICtrlCandidatePane::NewL( RWindow& aParent,
+CAknFepUICtrlCandidatePane* CAknFepUICtrlCandidatePane::NewL(RWindow& aParent, CAknFepUiLayoutDataMgr* aLafDataMgr)
-															  CAknFepUiLayoutDataMgr* aLafDataMgr,
+{
-															  MAknFepChineseUiMgr* aMgr )
+CAknFepUICtrlCandidatePane* self = new(ELeave) CAknFepUICtrlCandidatePane( aLafDataMgr );
-{
-CAknFepUICtrlCandidatePane* self = new(ELeave) CAknFepUICtrlCandidatePane( aLafDataMgr, aMgr );
 CleanupStack::PushL(self);
 self->ConstructL(aParent);
 CleanupStack::Pop();
 return self;
 }
 CAknFepUICtrlCandidatePane::~CAknFepUICtrlCandidatePane()
 {
-delete iCtrlScroll;
+delete iCandidateSelected;
-delete iPreview;
+delete iNaviArrowBitmapLeft;
+delete iNaviArrowBitmapLeftMask;
+delete iNaviArrowBitmapRight;
+delete iNaviArrowBitmapRightMask;
+delete iNaviArrowBitmapUp;
+delete iNaviArrowBitmapUpMask;
+delete iNaviArrowBitmapDown;
+delete iNaviArrowBitmapDownMask;
 if(iCandidateArray)
 	{
 	iCandidateArray->Reset();
 		delete iCandidateArray;
 	}
 iCandidateLabelArray.ResetAndDestroy();
+iOrdinalLabelArray.ResetAndDestroy();
 iCandidateModeArray.Reset();
 iPages.Reset();
 }
 const TDesC& CAknFepUICtrlCandidatePane::TextBuffer() const
 if(newLength - 1 < iSelected)
 {
 // as far as the client is concerned, they have removed the character that was selected
 // therefore we must now hide the selected candidate, although the highlighting
 // state remains unchanged
-		iCandidateLabelArray[iSelected]->SetHighlight( EFalse );
+iCandidateSelected->MakeVisible(EFalse);
 }
 else
 {
 if(iHighlighted)
 {
 // make sure that the candidate is visible, as the selection is now
 // within a visible range (it might have been hidden last time
 // the buffer was set)
-			iCandidateLabelArray[iSelected]->SetHighlight( ETrue );
+iCandidateSelected->MakeVisible(ETrue);
 }
 }
 TPtrC newText = aBuffer.Left(newLength);
 TPtr ptr = iBuffer.Des();
 }
 // only update and redraw label background if the value has changed
 if(valueChanged)
 {
 // we have already allocated enough memory for this
-				CAknFepUICtrlCandidateCharacter* candidateLabel = iCandidateLabelArray[i];
+CEikLabel* candidateLabel = iCandidateLabelArray[i];
-candidateLabel->SetText( newChar );
+TRAP_IGNORE(candidateLabel->SetTextL(newChar));
+// need to update the character if it is in the current selected candidate
+if(i == iSelected)
+{
+iCandidateSelected->SetText(newChar);
+iCandidateSelected->SetOrdinal(i + 1);
+DrawDeferred();
+}
+if(i < iVisibleCount)
+{
+// only redraw characters that are visible
+TRect rect = candidateLabel->Rect();
+Window().Invalidate(rect);
+}
 }
 }
 ptr.Copy(newText);
 LayoutLabels();
+LayoutCandidateSelected();
 iVisibleCount = newLength;
 UpdateLabelVisibility();
 }
 }
 TPage curPage = iPages[iCurDisplayPage];
 iVisibleCount = curPage.iEndIndex - curPage.iStartIndex + 1;
 if(iVisibleCount - 1 < iSelected)
 {
-		iCandidateLabelArray[iSelected]->SetHighlight( EFalse );
+iCandidateSelected->MakeVisible(EFalse);
 }
 else
 {
 if(iHighlighted)
 {
-			iCandidateLabelArray[iSelected]->SetHighlight( ETrue );
+iCandidateSelected->MakeVisible(ETrue);
 }
 }
 TBufC<EPhraseLength> buf;
 TPtr newText = buf.Des();
 for(TInt i = 0; i < iVisibleCount; i ++)
 {
-		CAknFepUICtrlCandidateCharacter* candidateLabel = iCandidateLabelArray[i];
+CEikLabel* candidateLabel = iCandidateLabelArray[i];
 const TDesC* txtLabel = candidateLabel->Text();
 newText = (*iCandidateArray)[curPage.iStartIndex + i];
-if (( txtLabel->Compare(newText) != 0 ))
+if((txtLabel->Compare(newText) != 0) )
 {
 // we have already allocated enough memory for this
-TRAP_IGNORE( candidateLabel->SetText( newText ));
+TRAP_IGNORE( candidateLabel->SetTextL(newText));
 }
-if ( i < iVisibleCount )
+// need to update the character if it is in the current selected candidate
-{
+if(i == iSelected)
-// only redraw labels that are visible
+{
-TRect rect = candidateLabel->Rect();
+iCandidateSelected->SetText(newText);
-Window().Invalidate( rect );
+iCandidateSelected->SetOrdinal(i + 1);
+DrawDeferred();
+}
+if(i < iVisibleCount)
+{
+// only redraw labels that are visible
+TRect rect = candidateLabel->Rect();
+Window().Invalidate(rect);
 }
 }
 LayoutLabels();
+LayoutCandidateSelected();
 DrawDeferred();
 UpdateLabelVisibility();
 }
 void CAknFepUICtrlCandidatePane::SetHighlighted(TBool aHighlighted)
 {
 if(!COMPARE_BOOLS(iHighlighted, aHighlighted))
 {
 iHighlighted = aHighlighted;
-iCandidateLabelArray[iSelected]->SetHighlight( aHighlighted );
+iCandidateSelected->MakeVisible(aHighlighted);
+iCandidateSelected->DrawDeferred();
 }
 }
 TBool CAknFepUICtrlCandidatePane::Highlighted() const
 {
 TCandidateMode oldMode = iCandidateModeArray[aIndex];
 if(oldMode != aMode)
 {
 iCandidateModeArray[aIndex] = aMode;
+if(iSelected == aIndex)
+{
+LayoutCandidateSelected();
+}
 // only do drawing if visible
 if(aIndex < iVisibleCount)
 {
 LayoutLabel(aIndex);
 if(iSelected == aIndex && iHighlighted)
 {
+iCandidateSelected->DrawDeferred();
 }
 else
 {
-				CAknFepUICtrlCandidateCharacter* candidateLabel = iCandidateLabelArray[aIndex];
+CEikLabel* candidateLabel = iCandidateLabelArray[aIndex];
 TRect rect = candidateLabel->Rect();
 Window().Invalidate(rect);
 }
 }
 }
 return EFalse;
 }
 void CAknFepUICtrlCandidatePane::ShowHorizontalScrollArrows(TBool /*aValue*/)
 {
-// Left & right arrow are not need, so do nothing.
+// If the state is changed, the arrows will be redrawn in the new state.
+//    if(!COMPARE_BOOLS(iShowHorizontalScrollArrows, aValue))
+//        {
+//        iShowHorizontalScrollArrows = aValue;
+//        TRect rect = iIndiFepArrowLeft.Rect();
+//        Window().Invalidate(rect);
+//        rect = iIndiFepArrowRight.Rect();
+//        Window().Invalidate(rect);
+//        }
 }
 void CAknFepUICtrlCandidatePane::ShowUpScrollArrows(TBool aValue)
 {
-	// call function of scroll pane to show/hide up arrow.
+if (iShowUpScrollArrows != aValue)
-	iCtrlScroll->ShowUpScrollArrows( aValue );
+{
+iShowUpScrollArrows = aValue;
+TRect rect = iIndiFepArrowUp.Rect();
+Window().Invalidate(rect);
+}
 }
 void CAknFepUICtrlCandidatePane::ShowDownScrollArrows(TBool aValue)
 {
-	// call function of scroll pane to show/hide down arrow.
+if (iShowDownScrollArrows != aValue)
-	iCtrlScroll->ShowDownScrollArrows( aValue );
+{
+iShowDownScrollArrows = aValue;
+TRect rect = iIndiFepArrowDown.Rect();
+Window().Invalidate(rect);
+}
 }
 void CAknFepUICtrlCandidatePane::ShowLeftScrollArrows(TBool /*aValue*/)
 {
-	// Left arrow is not need, so do nothing.
+//    if (iShowLeftScrollArrows != aValue)
+//        {
+//        iShowLeftScrollArrows = aValue;
+//        TRect rect = iIndiFepArrowLeft.Rect();
+//        Window().Invalidate(rect);
+//        }
 }
 void CAknFepUICtrlCandidatePane::ShowRightScrollArrows(TBool /*aValue*/)
 {
-	// Right arrow is not need, so do nothing.
+//    if (iShowRightScrollArrows != aValue)
+//        {
+//        iShowRightScrollArrows = aValue;
+//        TRect rect = iIndiFepArrowRight.Rect();
+//        Window().Invalidate(rect);
+//        }
 }
 TBool CAknFepUICtrlCandidatePane::IsShowVerticalScrollArrows() const
 {
-	// call function of scroll pane to get scroll state
+return iShowVerticalScrollArrows;
-return iCtrlScroll->IsShowVerticalScrollArrows();
 }
 void CAknFepUICtrlCandidatePane::ShowVerticalScrollArrows(TBool aValue)
 {
-	// call function of scroll pane to set scroll state
+// If the state is changed, the arrows will be redrawn in the new state.
-	iCtrlScroll->ShowVerticalScrollArrows( aValue );
+if(!COMPARE_BOOLS(iShowVerticalScrollArrows, aValue))
+{
+iShowVerticalScrollArrows = aValue;
+TRect rect = iIndiFepArrowUp.Rect();
+Window().Invalidate(rect);
+rect = iIndiFepArrowDown.Rect();
+Window().Invalidate(rect);
+}
+}
+void CAknFepUICtrlCandidatePane::ShowCandidateOrdinals(TBool aValue)
+{
+if(!COMPARE_BOOLS(iShowCandidateOrdinals, aValue))
+{
+iShowCandidateOrdinals = aValue;
+iCandidateSelected->ShowOrdinal(aValue);
+UpdateLabelVisibility();
+}
+}
+TBool CAknFepUICtrlCandidatePane::IsShowCandidateOrdinals() const
+{
+return iShowCandidateOrdinals;
 }
 TInt CAknFepUICtrlCandidatePane::VisibleCandidateCount() const
 {
 return iVisibleCount;
 {
 if(iSelected < iVisibleCount - 1)
 {
 return SelectIndex(iSelected + 1);
 }
-else if( iSelected == iVisibleCount - 1 )
-	{
-		return SelectIndex(0);
-	}
 else
 {
 return EFalse;
 }
 }
 {
 if(iSelected > 0)
 {
 return SelectIndex(iSelected - 1);
 }
-else if( iSelected == 0 )
-	{
-return SelectIndex( iVisibleCount - 1 );
-}
 else
 {
 return EFalse;
 }
 }
-TBool CAknFepUICtrlCandidatePane::SelectIndex(TInt aIndex, TBool /*selected*/ )
+TBool CAknFepUICtrlCandidatePane::SelectIndex(TInt aIndex, TBool selected)
 {
-if( aIndex + 1 > iVisibleCount || aIndex < 0 )
+if(aIndex + 1 > iVisibleCount || aIndex < 0)
 {
 return EFalse;
 }
+if(iSelected != aIndex)
-if ( iSelected != aIndex )
+{
-	{
+if(iSelected + 1 > iVisibleCount && iHighlighted)
-		iCandidateLabelArray[iSelected]->SetHighlight( EFalse );
+{
-	}
+// candidate selection is currently hidden, as the current
+// selection is outside the range of valid candidates, therefore
-if ( iPointDown || iHighlighted )
+// show it again
-	{
+iCandidateSelected->MakeVisible(ETrue);
-		iCandidateLabelArray[aIndex]->SetHighlight( ETrue );
+}
-	}
 iSelected = aIndex;
+// move and repopulate the selected candidate control
+const TDesC* txtLabel = iCandidateLabelArray[aIndex]->Text();
+iCandidateSelected->SetText(*txtLabel);
+iCandidateSelected->SetOrdinal(iSelected + 1);
+LayoutCandidateSelected();
+if( selected )
+{
+DrawDeferred();
+}
+		}
 return ETrue;
 }
 TInt CAknFepUICtrlCandidatePane::SelectedIndex() const
 {
 TInt CAknFepUICtrlCandidatePane::LabelTextWidthInPixels( TInt aIndex)
 {
 TAknLayoutText layoutText;
 TAknTextLineLayout candidatePaneLayoutText =
-CAknFepChineseUIDataConv::AnyToTextLine(iLafDataMgr->RequestData( ECharacterTextLayout ));
+CAknFepChineseUIDataConv::AnyToTextLine(iLafDataMgr->RequestData( ECandidatePaneTextLine ));
 layoutText.LayoutText(Rect(), candidatePaneLayoutText);
 const CFont* font = layoutText.Font();
 }
 // For fix bug of when the count of character in the last page is less than
 // the previous page of the last page. And then select the last character of
 // the previous page of the last page, and select next page. First of the last
 // page is not refreshed.
-iCandidateLabelArray[iSelected]->SetHighlight( EFalse );
 iSelected = 0;
 }
 void CAknFepUICtrlCandidatePane::PreviousCandidatePage(void)
 {
 }
 }
 void CAknFepUICtrlCandidatePane::SizeChanged()
 {
+LayoutRects();
 LayoutContainedControls();
 }
 TInt CAknFepUICtrlCandidatePane::CountComponentControls() const
 {
 TInt count = 0;
 count += iCandidateLabelArray.Count();
+count += iOrdinalLabelArray.Count();
 CCoeControl* controls[] =
 {
-iCtrlScroll,
+iCandidateSelected
-iPreview
 } ;
 for (TUint ii = 0 ; ii < (sizeof(controls) / sizeof(CCoeControl*)) ; ii++)
 {
 if(controls[ii])
 }
 CCoeControl* CAknFepUICtrlCandidatePane::ComponentControl(TInt aIndex) const
 {
 TInt candidateCount = iCandidateLabelArray.Count();
+TInt ordinalCount = iOrdinalLabelArray.Count();
 if(aIndex < candidateCount)
 {
 // because this method is const, the const [] operator is selected
 // which means that the pointer is const, so have to cast away constness
 // - a possible alternative is to make the array mutable?
-return CONST_CAST(CAknFepUICtrlCandidateCharacter*, iCandidateLabelArray[aIndex]);
+return CONST_CAST(CEikLabel*, iCandidateLabelArray[aIndex]);
 }
 aIndex -= candidateCount;
+if(aIndex < ordinalCount)
+{
+// because this method is const, the const [] operator is selected
+// which means that the pointer is const, so have to cast away constness
+// - a possible alternative is to make the array mutable?
+return CONST_CAST(CEikLabel*, iOrdinalLabelArray[aIndex]);
+}
+aIndex -= ordinalCount;
 CCoeControl* controls[] =
 {
-// iCandidateSelected,
+iCandidateSelected
-iCtrlScroll,
-iPreview
 } ;
 for (TUint ii = 0; (ii < sizeof(controls) / sizeof(CCoeControl*)) ; ii++)
 {
 if (controls[ii] && aIndex-- == 0)
 }
 // shouldn't be called while no components.
 return NULL ;
 }
+void CAknFepUICtrlCandidatePane::Draw(const TRect& /* aRect */) const
+{
+CWindowGc& gc = SystemGc();
+if(iShowHorizontalScrollArrows)
+{
+if (iShowLeftScrollArrows)
+{
+iIndiFepArrowLeft.DrawImage(gc,
+iNaviArrowBitmapLeft,
+iNaviArrowBitmapLeftMask);
+}
+if (iShowRightScrollArrows)
+{
+iIndiFepArrowRight.DrawImage(gc,
+iNaviArrowBitmapRight,
+iNaviArrowBitmapRightMask);
+}
+}
+if(iShowVerticalScrollArrows)
+{
+if (iShowUpScrollArrows)
+{
+iIndiFepArrowUp.DrawImage(gc,
+iNaviArrowBitmapUp,
+iNaviArrowBitmapUpMask);
+}
+if (iShowDownScrollArrows)
+{
+iIndiFepArrowDown.DrawImage(gc,
+iNaviArrowBitmapDown,
+iNaviArrowBitmapDownMask);
+}
+}
+}
 void CAknFepUICtrlCandidatePane::ConstructL(RWindow& aParent)
 {
 SetContainerWindowL(aParent);
+ConstructBitmapsL();
 TBuf<EOneCandidate> ordinal;
 for(TInt i = 0; i < EMaxCandidates; i++)
 {
-CAknFepUICtrlCandidateCharacter* candidateLabel = CAknFepUICtrlCandidateCharacter::NewL( aParent, this );
+CEikLabel* candidateLabel = new(ELeave) CEikLabel;
 CleanupStack::PushL(candidateLabel);
 candidateLabel->SetContainerWindowL(aParent);
+candidateLabel->SetBufferReserveLengthL(EPhraseLength);
 // ownership is passed, unless allocation is unsuccessful, in which case we still have it on the stack
 User::LeaveIfError(iCandidateLabelArray.Append(candidateLabel));
 CleanupStack::Pop(); // candidateLabel
+CEikLabel* ordinalLabel = new(ELeave) CEikLabel;
+CleanupStack::PushL(ordinalLabel);
+ordinalLabel->SetContainerWindowL(aParent);
+ordinalLabel->SetBufferReserveLengthL(EOneCandidate);
+ordinal.Num((i+1)%10); // digits are [1, 2,,, 9, 0] - only want the last digit in the case of 10!
+ordinalLabel->SetTextL(ordinal);
+// ownership is passed, unless allocation is unsuccessful, in which case we still have it on the stack
+User::LeaveIfError(iOrdinalLabelArray.Append(ordinalLabel));
+CleanupStack::Pop(); // ordinalLabel
 User::LeaveIfError(iCandidateModeArray.Append(ECandidateModeNormal));
 }
+iCandidateSelected = CAknFepUICtrlCandidateSelected::NewL(aParent);
+iCandidateSelected->MakeVisible(iHighlighted);
+iCandidateSelected->SetMopParent(this);
 iCandidateArray = new(ELeave) CDesCArrayFlat(1);
+}
-// scroll part
-iCtrlScroll = CAknFepUICtrlCandidateScroll::NewL( aParent, this );
+void CAknFepUICtrlCandidatePane::ConstructBitmapsL()
-iCtrlScroll->SetMopParent(this);
+{
+MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-// character preview
-iPreview = CAknFepPreview::NewL( aParent );
+TFileName bmpFile;
-}
+bmpFile.Copy(_L("z:"));
+bmpFile.Append(KDC_BITMAP_DIR);
-CAknFepUICtrlCandidatePane::CAknFepUICtrlCandidatePane(CAknFepUiLayoutDataMgr* aLafDataMgr, MAknFepChineseUiMgr* aMgr )
+bmpFile.Append(KFepUiControlsBitmapFile);
+AknsUtils::CreateColorIconL( skin,
+KAknsIIDQgnIndiFepArrowLeft,
+KAknsIIDQsnIconColors,
+EAknsCIQsnIconColorsCG20,
+iNaviArrowBitmapLeft,
+iNaviArrowBitmapLeftMask,
+bmpFile,
+EMbmAknfepuictrlsQgn_indi_fep_arrow_left,
+EMbmAknfepuictrlsQgn_indi_fep_arrow_left_mask,
+AKN_LAF_COLOR( 0 )
+);
+AknsUtils::CreateColorIconL( skin,
+KAknsIIDQgnIndiFepArrowRight,
+KAknsIIDQsnIconColors,
+EAknsCIQsnIconColorsCG20,
+iNaviArrowBitmapRight,
+iNaviArrowBitmapRightMask,
+bmpFile,
+EMbmAknfepuictrlsQgn_indi_fep_arrow_right,
+EMbmAknfepuictrlsQgn_indi_fep_arrow_right_mask,
+AKN_LAF_COLOR( 0 )
+);
+AknsUtils::CreateColorIconL( skin,
+KAknsIIDQgnIndiFepArrowUp,
+KAknsIIDQsnIconColors,
+EAknsCIQsnIconColorsCG20,
+iNaviArrowBitmapUp,
+iNaviArrowBitmapUpMask,
+bmpFile,
+EMbmAknfepuictrlsQgn_indi_fep_arrow_up,
+EMbmAknfepuictrlsQgn_indi_fep_arrow_up_mask,
+AKN_LAF_COLOR( 0 )
+);
+AknsUtils::CreateColorIconL( skin,
+KAknsIIDQgnIndiFepArrowDown,
+KAknsIIDQsnIconColors,
+EAknsCIQsnIconColorsCG20,
+iNaviArrowBitmapDown,
+iNaviArrowBitmapDownMask,
+bmpFile,
+EMbmAknfepuictrlsQgn_indi_fep_arrow_down,
+EMbmAknfepuictrlsQgn_indi_fep_arrow_down_mask,
+AKN_LAF_COLOR( 0 )
+);
+}
+CAknFepUICtrlCandidatePane::CAknFepUICtrlCandidatePane(CAknFepUiLayoutDataMgr* aLafDataMgr)
 :
 iPaneLayout(CAknFepUICtrlContainerChinese::ELayoutCandidate),
 iHighlighted(EFalse),
+iShowHorizontalScrollArrows(EFalse),
+iShowVerticalScrollArrows(EFalse),
+iShowUpScrollArrows(ETrue),
+iShowDownScrollArrows(ETrue),
+iShowLeftScrollArrows(ETrue),
+iShowRightScrollArrows(ETrue),
+iShowCandidateOrdinals(ETrue),
 iCurDisplayPage(0),
-iChineseUiMgr(aMgr),
+iOrdinalLableWidth(0)
-iPointDown( EFalse )
 {
 iLafDataMgr = aLafDataMgr;
 }
+void CAknFepUICtrlCandidatePane::LayoutRects()
+{
+TRect rect = Rect();
+TAknWindowLineLayout candidateWindowLine1 =
+CAknFepChineseUIDataConv::AnyToWindowLine( iLafDataMgr->RequestData(ECandidateWindowLine1));
+TAknWindowLineLayout candidateWindowLine2 =
+CAknFepChineseUIDataConv::AnyToWindowLine( iLafDataMgr->RequestData(ECandidateWindowLine2));
+TAknWindowLineLayout candidateWindowLine3 =
+CAknFepChineseUIDataConv::AnyToWindowLine( iLafDataMgr->RequestData(ECandidateWindowLine3));
+TAknWindowLineLayout candidateWindowLine4 =
+CAknFepChineseUIDataConv::AnyToWindowLine( iLafDataMgr->RequestData(ECandidateWindowLine4));
+iIndiFepArrowLeft.LayoutRect(rect, candidateWindowLine1);
+AknIconUtils::SetSize(iNaviArrowBitmapLeft, iIndiFepArrowLeft.Rect().Size());
+iIndiFepArrowRight.LayoutRect(rect, candidateWindowLine2);
+AknIconUtils::SetSize(iNaviArrowBitmapRight, iIndiFepArrowRight.Rect().Size());
+iIndiFepArrowUp.LayoutRect(rect, candidateWindowLine3);
+AknIconUtils::SetSize(iNaviArrowBitmapUp, iIndiFepArrowUp.Rect().Size());
+iIndiFepArrowDown.LayoutRect(rect, candidateWindowLine4);
+AknIconUtils::SetSize( iNaviArrowBitmapDown, iIndiFepArrowDown.Rect().Size() );
+}
 void CAknFepUICtrlCandidatePane::LayoutContainedControls()
 {
 LayoutLabels();
-LayoutScroll();
+LayoutCandidateSelected();
 }
 void CAknFepUICtrlCandidatePane::LayoutLabel(TInt aIndex)
 {
 __ASSERT_DEBUG(aIndex >= 0, AknFepUiInterfacePanic(EAknFepUiInterfacePanicAttemptedLayoutOutsideVisibleCount));
 __ASSERT_DEBUG(aIndex < iVisibleCount, AknFepUiInterfacePanic(EAknFepUiInterfacePanicAttemptedLayoutOutsideVisibleCount));
 TRect rect = Rect();
-CAknFepUICtrlCandidateCharacter* candidateLabel = iCandidateLabelArray[aIndex];
+CEikLabel* candidateLabel = iCandidateLabelArray[aIndex];
+CEikLabel* ordinalLabel = iOrdinalLabelArray[aIndex];
 TAknWindowLineLayout layoutCandidateItem =
-CAknFepChineseUIDataConv::AnyToWindowLine( iLafDataMgr->RequestData(ECharacterLayout));
+CAknFepChineseUIDataConv::AnyToWindowLine( iLafDataMgr->RequestData(ELayoutCandidateItem));
 TAknTextLineLayout candidateLayout =
-CAknFepChineseUIDataConv::AnyToTextLine( iLafDataMgr->RequestData(ECharacterTextLayout));
+CAknFepChineseUIDataConv::AnyToTextLine( iLafDataMgr->RequestData(ECandidatePaneTextLine));
 // layout candidate label
 TAknLayoutRect layoutRectCandidateItem;
-layoutRectCandidateItem.LayoutRect( rect,layoutCandidateItem );
+layoutRectCandidateItem.LayoutRect(rect,layoutCandidateItem);
 TRect rectCandidateItem = layoutRectCandidateItem.Rect();
-if ( aIndex > 0 )
+if(aIndex > 0)
 	    {
 	    rectCandidateItem.iTl.iX = iCandidateLabelArray[aIndex - 1]->Rect().iBr.iX;
 }
 TAknLayoutText layoutText;
-layoutText.LayoutText( rectCandidateItem, candidateLayout );
+layoutText.LayoutText(rectCandidateItem,candidateLayout);
-TInt interval = candidateLayout.il + candidateLayout.ir;
+TRect rectText = layoutText.TextRect();
+rectText.SetWidth(LabelTextWidthInPixels(aIndex));
-TInt width = LabelTextWidthInPixels( aIndex );
-TInt minwidth = layoutRectCandidateItem.Rect().Width() - interval ;
+candidateLabel->SetRect(rectText);
-if ( width < minwidth )
+candidateLabel->SetFont(layoutText.Font());
-	{
-		width = minwidth;
+// layout ordinal label
-	}
+TAknTextLineLayout ordinalLayout =
-rectCandidateItem.SetWidth( width + interval );
+CAknFepChineseUIDataConv::AnyToTextLine( iLafDataMgr->RequestData(EOrdinalCandidateTextLayout));
-candidateLabel->SetRect( rectCandidateItem );
+TBufC16<1> buf;
+TAknLayoutText layoutOrdinal;
+TPtr16 ptr = buf.Des();
+ptr = (*(ordinalLabel->Text())).Left(EOneCandidate);
+layoutOrdinal.LayoutText(rectCandidateItem,ordinalLayout);
+const CFont* font = layoutOrdinal.Font();
+TRect rectOrdinal = layoutOrdinal.TextRect();
+// align ordinal label and candidate label
+/* removed in 2006.03.29
+rectOrdinal.iTl.iY = rectText.iTl.iY;
+rectOrdinal.SetWidth(font->TextWidthInPixels(ptr));
+rectOrdinal.SetHeight(font->HeightInPixels());
+*/
+// inserted in 2006.03.29
+TPoint ordinalPosition;
+TInt ordinalWidth = font->TextWidthInPixels(ptr);
+ordinalPosition.iX = rectText.iTl.iX - ordinalWidth;
+ordinalPosition.iY = rectText.iTl.iY;
+rectOrdinal = TRect(ordinalPosition,
+TPoint(ordinalPosition.iX + rectOrdinal.Width(),
+ordinalPosition.iY + rectOrdinal.Height()));
+// end inserting
+ordinalLabel->SetRect(rectOrdinal);
+ordinalLabel->SetFont(font);
+iOrdinalLableWidth = rectOrdinal.Width();
 // override colours if skin data present
 MAknsSkinInstance* skin = AknsUtils::SkinInstance();
 TRgb candidateLabelTextColor = layoutText.Color();
+TRgb ordinalLabelTextColor = layoutOrdinal.Color();
 AknsUtils::GetCachedColor(skin, candidateLabelTextColor,
 KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG19);
+AknsUtils::GetCachedColor(skin, ordinalLabelTextColor,
+KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG19);
 TRAP_IGNORE(
 candidateLabel->OverrideColorL(EColorLabelText, candidateLabelTextColor);
+ordinalLabel->OverrideColorL(EColorLabelText, ordinalLabelTextColor);
 );
 }
 void CAknFepUICtrlCandidatePane::LayoutLabels()
 {
 for(TInt i = 0; i < iVisibleCount; i++)
 {
 LayoutLabel(i);
 }
 }
-void CAknFepUICtrlCandidatePane::LayoutScroll()
-{
+void CAknFepUICtrlCandidatePane::LayoutCandidateSelected()
-TAknWindowLineLayout scrolllayout =  CAknFepChineseUIDataConv::AnyToWindowLine( iLafDataMgr->RequestData(EScrollLayout));
+{
-AknLayoutUtils::LayoutControl( iCtrlScroll, Rect(), scrolllayout );
+TCandidateMode candidateMode = iCandidateModeArray[iSelected];
+iCandidateSelected->SetCandidateMode(candidateMode);
+iCandidateSelected->SetLayout(iPaneLayout);
+TRect ordinalRect = iOrdinalLabelArray[iSelected]->Rect();
+TAknLayoutRect layoutRect;
+TAknWindowLineLayout layoutCandidateItem =
+CAknFepChineseUIDataConv::AnyToWindowLine( iLafDataMgr->RequestData(ELayoutCandidateItem));
+layoutRect.LayoutRect(Rect(),layoutCandidateItem);
+TRect rectLayoutCandidateItem = layoutRect.Rect();
+rectLayoutCandidateItem.iTl.iX = ordinalRect.iTl.iX;
+TAknTextLineLayout candidateLayout =
+CAknFepChineseUIDataConv::AnyToTextLine( iLafDataMgr->RequestData(ECandidatePaneTextLine));
+TAknTextLineLayout ordinalLayout =
+CAknFepChineseUIDataConv::AnyToTextLine( iLafDataMgr->RequestData(EOrdinalCandidateTextLayout));
+rectLayoutCandidateItem.SetWidth(iCandidateLabelArray[iSelected]->Rect().Width() + candidateLayout.il - ordinalLayout.il);
+rectLayoutCandidateItem.SetHeight(rectLayoutCandidateItem.Height() - 1);
+iCandidateSelected->SetRect(rectLayoutCandidateItem);
 }
 void CAknFepUICtrlCandidatePane::UpdateLabelVisibility()
 {
 TInt number = 0;
 {
 number =  iVisibleCount;
 }
 for(TInt i = 0; i < EMaxCandidates; i++)
 {
-CAknFepUICtrlCandidateCharacter* candidateLabel = iCandidateLabelArray[i];
+CEikLabel* candidateLabel = iCandidateLabelArray[i];
+CEikLabel* ordinalLabel = iOrdinalLabelArray[i];
 if(i < number)
 {
 candidateLabel->MakeVisible(ETrue);
+ordinalLabel->MakeVisible(iShowCandidateOrdinals); // only show if needed
 }
 else
 {
 candidateLabel->MakeVisible(EFalse);
+ordinalLabel->MakeVisible(EFalse); // don't show it as there is no character to go with it
 }
 }
 }
 void CAknFepUICtrlCandidatePane::ResetCandidateState()
 return;
 }
 TPage curPage;
 TInt index = iUnpagedIndex;
-CAknFepUICtrlCandidateCharacter* candidateLabel;
+CEikLabel* candidateLabel;
 curPage.iStartIndex = index;
 curPage.iEndIndex = index;
 TInt candidateLeftNum = phraseCandidateNum - index > EMaxCandidates?
 EMaxCandidates : phraseCandidateNum - index;
 TAknWindowLineLayout layoutCandidateItem =
-CAknFepChineseUIDataConv::AnyToWindowLine( iLafDataMgr->RequestData(ECharacterLayout));
+CAknFepChineseUIDataConv::AnyToWindowLine( iLafDataMgr->RequestData(ELayoutCandidateItem));
-TAknWindowLineLayout candidateRect =
-CAknFepChineseUIDataConv::AnyToWindowLine( iLafDataMgr->RequestData(EScrollLayout));
 TAknTextLineLayout candidateLayout =
-CAknFepChineseUIDataConv::AnyToTextLine( iLafDataMgr->RequestData(ECharacterTextLayout));
+CAknFepChineseUIDataConv::AnyToTextLine( iLafDataMgr->RequestData(ECandidatePaneTextLine));
-TInt interval = candidateLayout.il + candidateLayout.ir;
 // avoid accessing layout data member
 TAknLayoutRect layoutRect;
 layoutRect.LayoutRect(Rect(),layoutCandidateItem);
 TRect rectLayoutCandidateItem = layoutRect.Rect();
 TAknLayoutText layoutText;
 layoutText.LayoutText(rectLayoutCandidateItem,candidateLayout);
-TRect rectText = Rect();
+TRect rectText = layoutText.TextRect();
-TInt distance = rectText.iTl.iX - rectLayoutCandidateItem.iTl.iX + rectText.iBr.iX - rectLayoutCandidateItem.iBr.iX;
-rectLayoutCandidateItem.iBr.iX += distance - candidateRect.iW;
+TInt distance = rectText.iTl.iX - rectLayoutCandidateItem.iTl.iX + rectLayoutCandidateItem.iBr.iX - rectText.iBr.iX;
+rectLayoutCandidateItem.iTl.iX += distance;
+TInt width = 0;
 TInt i = 0;
 const TInt candidateWidth = rectLayoutCandidateItem.Width();
 for ( i = 0; i < candidateLeftNum; i ++ )
 {
 candidateLabel = iCandidateLabelArray[i];
 // labelWidth in the font
 const CFont* font = layoutText.Font();
 TPtrC newText = (*iCandidateArray)[iUnpagedIndex + i];
 TInt labelWidth = font->TextWidthInPixels( newText );
-labelWidth = interval + ( labelWidth > layoutText.TextRect().Width() ? labelWidth : layoutText.TextRect().Width());
 if ( labelWidth > candidateWidth )
 {
 TBufC<EPhraseLength+10> buf1;
 TPtr text( buf1.Des() );
 iCandidateArray->Delete( iUnpagedIndex + i );
 TRAP_IGNORE(
 {
 iCandidateArray->InsertL( iUnpagedIndex + i, text );
-candidateLabel->SetText(text);
+candidateLabel->SetTextL(text);
 });
 }
 else
 {
-TRAP_IGNORE( candidateLabel->SetText(newText));
+TRAP_IGNORE( candidateLabel->SetTextL(newText));
-rectLayoutCandidateItem.iTl.iX += labelWidth;
+width = LabelTextWidthInPixels(i)+ iOrdinalLableWidth;
-}
+rectLayoutCandidateItem.iTl.iX += width;
-if (rectLayoutCandidateItem.iTl.iX > rectLayoutCandidateItem.iBr.iX)
+}
+if (rectLayoutCandidateItem.iTl.iX >= rectLayoutCandidateItem.iBr.iX)
 {
 if (index>0)
 {
 curPage.iEndIndex = index - 1;
 }
 return iCurDisplayPage == 0;
 }
 TBool CAknFepUICtrlCandidatePane::IsLastPage()
 {
-	if( iPages.Count() == 0 )
+if( iCandidateArray->Count() == iUnpagedIndex )
-		{
-		return ETrue;
-		}
-	else if( iCandidateArray->Count() == iUnpagedIndex )
 {
 return iCurDisplayPage == iPages.Count() - 1;
 }
 return EFalse;
 }
 void CAknFepUICtrlCandidatePane::SetInVisiable()
 {
-	iCandidateLabelArray[iSelected]->SetHighlight( EFalse );
-	TRAP_IGNORE( iPreview->HideL());
 for (TInt i = 0; i < EMaxCandidates; i ++)
 {
-		CAknFepUICtrlCandidateCharacter* candidateLabel = iCandidateLabelArray[i];
+CEikLabel* candidateLabel = iCandidateLabelArray[i];
+CEikLabel* ordinalLabel = iOrdinalLabelArray[i];
 candidateLabel->MakeVisible(EFalse);
-}
+ordinalLabel->MakeVisible(EFalse);
+}
+iCandidateSelected->MakeVisible(EFalse);
 }
 TBool CAknFepUICtrlCandidatePane::NeedGetNewCandidatePage()
 {
 return (iCandidateArray->Count() - iUnpagedIndex < CandidateCountLeft);
 	{
 	if (!aEnable)
 		{
 		for (TInt i=0; i<iVisibleCount; i++)
 			{
-			iCandidateLabelArray[i]->SetText( KNullDesC );
+			TRAP_IGNORE(iCandidateLabelArray[i]->SetTextL(KNullDesC));
 			}
-		TRAP_IGNORE( HidePreviewL();)
 		iCandidateArray->Reset();
 		iVisibleCount = 0;
 		DrawNow();
 		}
 	}
-void CAknFepUICtrlCandidatePane::FepUIClosePressed()
-	{
-	// Click close to close container
-	if ( iChineseUiMgr )
-		{
-		iChineseUiMgr->CloseContainer();
-		}
-	}
-void CAknFepUICtrlCandidatePane::SetFepUiState( MAknFepUiStateCtrl* aFepUiState )
-{
-	iFepUiState = aFepUiState;
-}
-void CAknFepUICtrlCandidatePane::HidePreviewL()
-	{
-	if( iPreview && iPreview->IsVisible())
-		{
-		iPreview->HideL();
-		}
-	}
-void CAknFepUICtrlCandidatePane::HandlePointerEventL( const TPointerEvent & aPointerEvent )
-	{
-	CCoeControl::HandlePointerEventL( aPointerEvent );
-// Press will pop up preview
-	if ( aPointerEvent.iType == TPointerEvent::EButton1Down )
-		{
-		for ( TInt i = 0; i < iVisibleCount; i++ )
-{
-	        if ( iCandidateLabelArray[i]->Rect().Contains( aPointerEvent.iPosition ))
-		        {
-				iPointDown = ETrue;
-SelectIndex( i );
-	            const TDesC* txtLabel = iCandidateLabelArray[i]->Text();
-	            TPoint point = iCandidateLabelArray[i]->PositionRelativeToScreen();
-	            TRect rect( point, iCandidateLabelArray[i]->Size());
-	            // if container is show on top, the preview should show bellow the character
-	            // else the preview should show above the character.
-	            TInt bottom = ShowAboveCharacter;
-	            if ( point.iY < iCandidateLabelArray[i]->Rect().iBr.iY )
-	                {
-				    bottom = ShowBellowCharacter;
-	                }
-	            rect.Move( 0, (iCandidateLabelArray[i]->Size().iHeight ) * bottom );
-	            iPreview->ShowL( rect, *txtLabel );
-	            break;
-	    	    }
-}
-}
-	// Up will submit text
-	else if ( aPointerEvent.iType == TPointerEvent::EButton1Up && iPointDown )
-		{
-		iPointDown = EFalse;
-	    for ( TInt i = 0; i < iVisibleCount; i++ )
-	        {
-		    if ( iCandidateLabelArray[i]->Rect().Contains( aPointerEvent.iPosition ))
-			    {
-			    if ( iChineseUiMgr )
-			        {
-			        const TDesC* text = iCandidateLabelArray[i]->Text();
-			        iChineseUiMgr->SubmitSelectedTextL( *text );
-			        }
-			    break;
-			    }
-	        }
-	    if( iPreview->IsVisible())
-	    	{
-			iPreview->HideL();
-	    	}
-	    if( !iHighlighted )
-	    	{
-			iCandidateLabelArray[iSelected]->SetHighlight( iHighlighted );
-	    	}
-		}
-	// Drag out of candidate pane, hide preview
-	else if ( aPointerEvent.iType == TPointerEvent::EDrag && iPointDown )
-		{
-	    TBool bContain = EFalse;
-		for ( TInt i = 0; ( !bContain ) && ( i < iVisibleCount ); i++ )
-		    {
-			if ( iCandidateLabelArray[i]->Rect().Contains( aPointerEvent.iPosition ))
-				{
-				TBool bSameIndex = ( i == iSelected );
-				SelectIndex( i );
-				if ( !bSameIndex )
-					{
-					const TDesC* txtLabel = iCandidateLabelArray[i]->Text();
-					TPoint point = iCandidateLabelArray[i]->PositionRelativeToScreen();
-					TRect rect( point, iCandidateLabelArray[i]->Size());
-					TInt bottom = ShowAboveCharacter;
-					// If container is moved to top,
-					// then pop up preview below the character
-					if ( point.iY < iCandidateLabelArray[i]->Rect().iBr.iY )
-						{
-						bottom = ShowBellowCharacter;
-						}
-					rect.Move( 0, (iCandidateLabelArray[i]->Size().iHeight ) * bottom );
-					iPreview->ShowL( rect, *txtLabel );
-					}
-				bContain = ETrue;
-				break;
-			    }
-		    }
-		if ( !bContain )
-			{
-			iPreview->HideL();
-			iCandidateLabelArray[iSelected]->SetHighlight( iHighlighted );
-			if( !iHighlighted )
-				{
-				iSelected = 0;
-				}
-			}
-		else if( bContain && !iPreview->IsVisible())
-			{
-			const TDesC* txtLabel = iCandidateLabelArray[iSelected]->Text();
-			TPoint point = iCandidateLabelArray[iSelected]->PositionRelativeToScreen();
-			TRect rect( point, iCandidateLabelArray[iSelected]->Size());
-			TInt bottom = ShowAboveCharacter;
-			// If container is moved to top,
-			// then pop up preview below the character
-			if ( point.iY < iCandidateLabelArray[iSelected]->Rect().iBr.iY )
-				{
-				bottom = ShowBellowCharacter;
-				}
-			rect.Move( 0, (iCandidateLabelArray[iSelected]->Size().iHeight ) * bottom );
-			iPreview->ShowL( rect, *txtLabel );
-			}
-		}
-	else
-		{
-		// do nothing
-		}
-	}
-CAknFepPreview* CAknFepPreview::NewL( RWindowTreeNode& aParent )
-	{
-	CAknFepPreview* self = new(ELeave) CAknFepPreview;
-CleanupStack::PushL(self);
-self->ConstructL( aParent );
-CleanupStack::Pop();
-return self;
-	}
-CAknFepPreview::~CAknFepPreview()
-	{
-	delete iPreviewLabel;
-	}
-void CAknFepPreview::Draw( const TRect& /*aRect*/ ) const
-	{
-CWindowGc& gc = SystemGc();
-	MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-	TRect outerRect;
-	TRect innerRect;
-	CalculateFrameRects( outerRect, innerRect );
-	gc.SetBrushColor( KRgbGray );
-	// draw the whole frame background according to the containing context, which in this case
-	// is the candidate pane, to avoid corner drawing mess and to cope with masked grid frame centre
-	MAknsControlContext* cc = AknsDrawUtils::ControlContext(this);
-	AknsDrawUtils::DrawFrame( skin, gc, outerRect, innerRect,
-							  KAknsIIDQsnFrInputCharPreview, KAknsIIDDefault );
-	}
-void CAknFepPreview::SizeChanged()
-	{
-TRect rect = Rect();
-TAknTextLineLayout candidateLayout = AknLayoutScalable_Avkon::cell_hyb_candi_pane_t1(0);
-// Get preview rect and font.
-TAknLayoutText layoutText;
-layoutText.LayoutText( rect, candidateLayout );
-TRect rectText = layoutText.TextRect();
-const CFont* font = layoutText.Font();
-iPreviewLabel->SetRect( rectText );
-iPreviewLabel->SetFont( font );
-// override with skin text color
-MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-TRgb labelTextColor;
-AknsUtils::GetCachedColor( skin, labelTextColor,
-KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG11 );
-TRAP_IGNORE(
-		iPreviewLabel->OverrideColorL(EColorLabelText, labelTextColor);	 )
-	}
-void CAknFepPreview::ShowL( TRect& aRect, const TDesC& aCharacter )
-	{
-	SetRect( aRect );
-	iPreviewLabel->SetTextL( aCharacter );
-	MakeVisible( ETrue );
-	RWindow& window = Window();
-	window.SetOrdinalPosition( 0, ECoeWinPriorityAlwaysAtFront + 100 );
-	DrawNow();
-	}
-void CAknFepPreview::HideL()
-	{
-	MakeVisible( EFalse );
-	iPreviewLabel->SetTextL( KNullDesC );
-	DrawNow();
-	}
-TInt CAknFepPreview::CountComponentControls() const
-	{
-CCoeControl* controls[] =
-{
-iPreviewLabel
-};
-TInt count = 0;
-for ( TUint ii = 0 ; ii < (sizeof(controls) / sizeof(CCoeControl*)); ii++ )
-{
-if ( controls[ii] )
-{
-count++;
-}
-}
-return count ;
-	}
-CCoeControl* CAknFepPreview::ComponentControl(TInt aIndex) const
-	{
-CCoeControl* controls[] =
-{
-iPreviewLabel
-};
-for ( TUint ii = 0; (ii < sizeof(controls) / sizeof(CCoeControl*)); ii++ )
-{
-if ( controls[ii] && aIndex-- == 0 )
-{
-return controls[ii];
-}
-}
-// shouldn't be called while no components.
-return NULL ;
-	}
-CAknFepPreview::CAknFepPreview()
-	{
-	}
-void CAknFepPreview::ConstructL( RWindowTreeNode& /*aParent */)
-	{
-	RWindowGroup& wg = CCoeEnv::Static()->RootWin();
-	CreateWindowL( wg );
-	RWindow& window = Window();
-	iPreviewLabel = new( ELeave ) CEikLabel;
-	iPreviewLabel->SetContainerWindowL( window );
-	iPreviewLabel->SetLabelAlignment( ELayoutAlignCenter );
-	iPreviewLabel->SetMopParent( this );
-	window.SetRequiredDisplayMode( EColor16MA );
-	window.SetTransparencyAlphaChannel();
-	window.SetOrdinalPosition( 0, ECoeWinPriorityAlwaysAtFront + 100 );
-	window.SetFaded( EFalse, RWindowTreeNode::EFadeIncludeChildren );
-	// Enable receive drag event.
-	Window().PointerFilter( EPointerFilterDrag, 0 );
-	MakeVisible( EFalse );
-	ActivateL();
-	}
-void CAknFepPreview::CalculateFrameRects(TRect& aOuterRect, TRect& aInnerRect) const
-	{
-	TRect windowRect = Rect();
-	TAknLayoutRect topLeft;
-	topLeft.LayoutRect( windowRect, SkinLayout::Highlight_skin_placing__grid__Line_2());
-	TAknLayoutRect bottomRight;
-	bottomRight.LayoutRect( windowRect, SkinLayout::Highlight_skin_placing__grid__Line_5());
-	aOuterRect = TRect( topLeft.Rect().iTl, bottomRight.Rect().iBr );
-	aInnerRect = TRect( topLeft.Rect().iBr, bottomRight.Rect().iTl );
-	}
-CAknFepUICtrlCandidateScroll* CAknFepUICtrlCandidateScroll::NewL(
-							RWindowTreeNode& aParent, MAknFepUIEventObserver* aObserver )
-	{
-	CAknFepUICtrlCandidateScroll* self = new(ELeave) CAknFepUICtrlCandidateScroll;
-CleanupStack::PushL(self);
-self->ConstructL( aParent, aObserver );
-CleanupStack::Pop();
-return self;
-	}
-CAknFepUICtrlCandidateScroll::~CAknFepUICtrlCandidateScroll()
-	{
-	// delete bitmaps
-	delete iScrollCloseBitmap;
-	delete iScrollCloseBitmapMask;
-delete iNaviArrowBitmapUp;
-delete iNaviArrowBitmapUpMask;
-delete iNaviArrowBitmapDown;
-delete iNaviArrowBitmapDownMask;
-	}
-void CAknFepUICtrlCandidateScroll::SizeChanged()
-	{
-	LayoutIcon();
-	}
-void CAknFepUICtrlCandidateScroll::Draw( const TRect& /*aRect*/ ) const
-	{
-CWindowGc& gc = SystemGc();
-	MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-	// draw the whole frame background according to the containing context, which in this case
-	// is the candidate pane, to avoid corner drawing mess and to cope with masked grid frame centre
-	MAknsControlContext* cc = AknsDrawUtils::ControlContext(this);
-	TRect rect = Rect();
-	// Draw scroll background
-	AknsDrawUtils::DrawBackground( skin, cc, this, gc,
-								   rect.iTl, rect, KAknsDrawParamDefault );
-	// Draw close Rects
-	if ( iShowClose )
-		{
-		TRect outerRect;
-		TRect innerRect;
-		CalculateCloseRects( outerRect, innerRect );
-		AknsDrawUtils::DrawFrame( skin, gc, outerRect, innerRect,
-								  KAknsIIDQsnFrKeypadButtonFrNormal, KAknsIIDDefault );
-		// Draw close bitmap
-		iIndiFepClose.DrawImage( gc,
-								 iScrollCloseBitmap,
-								 iScrollCloseBitmapMask );
-		}
-	// Draw Up arrow & Down arrow
-	if ( iShowVerticalScrollArrows )
-	    {
-	    if ( iShowUpScrollArrows )
-	        {
-	        iIndiFepArrowUp.DrawImage( gc,
-	                                   iNaviArrowBitmapUp,
-	                                   iNaviArrowBitmapUpMask );
-	        }
-	    if ( iShowDownScrollArrows )
-	        {
-	        iIndiFepArrowDown.DrawImage( gc,
-	                                     iNaviArrowBitmapDown,
-	                                     iNaviArrowBitmapDownMask );
-	        }
-	    }
-	}
-void CAknFepUICtrlCandidateScroll::HandlePointerEventL( const TPointerEvent & aPointerEvent )
-	{
-	// Close area is click will close the container
-	if ( iObServer != NULL && iIndiFepClose.Rect().Contains( aPointerEvent.iPosition ))
-		{
-		iObServer->FepUIClosePressed();
-		}
-	}
-void CAknFepUICtrlCandidateScroll::ShowUpScrollArrows(TBool aValue)
-{
-	// Update the up arrow if needed
-if ( iShowUpScrollArrows != aValue )
-{
-iShowUpScrollArrows = aValue;
-TRect rect = iIndiFepArrowUp.Rect();
-Window().Invalidate(rect);
-}
-}
-void CAknFepUICtrlCandidateScroll::ShowDownScrollArrows( TBool aValue )
-{
-	// Update the down arrow if needed
-if ( iShowDownScrollArrows != aValue )
-{
-iShowDownScrollArrows = aValue;
-TRect rect = iIndiFepArrowDown.Rect();
-Window().Invalidate(rect);
-}
-}
-void CAknFepUICtrlCandidateScroll::ShowVerticalScrollArrows( TBool aValue )
-{
-// If the state is changed, the arrows will be redrawn in the new state.
-if(!COMPARE_BOOLS(iShowVerticalScrollArrows, aValue))
-{
-iShowVerticalScrollArrows = aValue;
-//TRect rect = iIndiFepArrowUp.Rect();
-DrawDeferred();
-//rect = iIndiFepArrowDown.Rect();
-//Window().Invalidate(rect);
-}
-}
-TBool CAknFepUICtrlCandidateScroll::IsShowVerticalScrollArrows() const
-{
-return iShowVerticalScrollArrows;
-}
-void CAknFepUICtrlCandidateScroll::ConstructL( RWindowTreeNode& aParent,
-											   MAknFepUIEventObserver* aObserver )
-	{
-CreateWindowL( aParent );
-ConstructBitmapsL();
-iObServer = aObserver;
-TRect rect;
-AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EScreen, rect );
-// Dibert will not need close button
-iShowClose = rect.Height() == DibertHeight ? EFalse : ETrue;
-	}
-void CAknFepUICtrlCandidateScroll::ConstructBitmapsL()
-	{
-MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-TFileName bmpFile;
-bmpFile.Copy(_L("z:"));
-bmpFile.Append( KDC_BITMAP_DIR );
-bmpFile.Append( KFepUiControlsBitmapFile );
-// Create close bitmap
-AknsUtils::CreateColorIconL( skin,
-							     KAknsIIDQgnGrafFepCandiListClose,
-							     KAknsIIDQsnIconColors,
-							     EAknsCIQsnIconColorsCG20,
-							     iScrollCloseBitmap,
-							     iScrollCloseBitmapMask,
-							     bmpFile,
-							     EMbmAknfepuictrlsQgn_indi_input_candi_list_close,
-							     EMbmAknfepuictrlsQgn_indi_input_candi_list_close_mask,
-							     AKN_LAF_COLOR( 0 ));
-// Create Up bitmap
-AknsUtils::CreateColorIconL( skin,
-KAknsIIDQgnIndiFepArrowUp,
-KAknsIIDQsnIconColors,
-EAknsCIQsnIconColorsCG20,
-iNaviArrowBitmapUp,
-iNaviArrowBitmapUpMask,
-bmpFile,
-EMbmAknfepuictrlsQgn_indi_fep_arrow_up,
-EMbmAknfepuictrlsQgn_indi_fep_arrow_up_mask,
-AKN_LAF_COLOR( 0 ));
-// Create Down bitmap
-AknsUtils::CreateColorIconL( skin,
-KAknsIIDQgnIndiFepArrowDown,
-KAknsIIDQsnIconColors,
-EAknsCIQsnIconColorsCG20,
-iNaviArrowBitmapDown,
-iNaviArrowBitmapDownMask,
-bmpFile,
-EMbmAknfepuictrlsQgn_indi_fep_arrow_down,
-EMbmAknfepuictrlsQgn_indi_fep_arrow_down_mask,
-AKN_LAF_COLOR( 0 ));
-	}
-CAknFepUICtrlCandidateScroll::CAknFepUICtrlCandidateScroll()
-: iShowVerticalScrollArrows(EFalse),
-iShowUpScrollArrows(ETrue),
-iShowDownScrollArrows(ETrue),
-iShowClose(ETrue)
-	{
-	}
-void CAknFepUICtrlCandidateScroll::LayoutIcon()
-	{
-TRect rect = Rect();
-// layout arrow up
-TAknWindowLineLayout arrowUpLayout = AknLayoutScalable_Avkon::cell_hyb_candi_scroll_pane_g1(0);
-iIndiFepArrowUp.LayoutRect( rect, arrowUpLayout );
-AknIconUtils::SetSize(iNaviArrowBitmapUp, iIndiFepArrowUp.Rect().Size());
-// layout arrow down
-TAknWindowLineLayout arrowDownLayout = AknLayoutScalable_Avkon::cell_hyb_candi_scroll_pane_g2(0);
-iIndiFepArrowDown.LayoutRect( rect, arrowDownLayout );
-AknIconUtils::SetSize( iNaviArrowBitmapDown, iIndiFepArrowDown.Rect().Size());
-// layout close
-TAknWindowLineLayout closeLayout = AknLayoutScalable_Avkon::cell_hyb_candi_scroll_pane_g3(0);
-iIndiFepClose.LayoutRect( rect, closeLayout );
-AknIconUtils::SetSize( iScrollCloseBitmap, iIndiFepClose.Rect().Size());
-}
-void CAknFepUICtrlCandidateScroll::CalculateCloseRects(TRect& aOuterRect, TRect& aInnerRect) const
-	{
-	TRect windowRect = iIndiFepClose.Rect();
-	TAknLayoutRect topLeft;
-	topLeft.LayoutRect( windowRect, SkinLayout::Highlight_skin_placing__grid__Line_2());
-	TAknLayoutRect bottomRight;
-	bottomRight.LayoutRect( windowRect, SkinLayout::Highlight_skin_placing__grid__Line_5());
-	aOuterRect = TRect( topLeft.Rect().iTl, bottomRight.Rect().iBr );
-	aInnerRect = TRect( topLeft.Rect().iBr, bottomRight.Rect().iTl );
-	}
 // End of file

branch	RCL_3
changeset 56	8152b1f1763a
parent 50	5a1685599b76