FCL/sf/app/commonemail: comparison emailuis/uicomponents/src/fstreeplaintwolineitemvisualizer.cpp

equal deleted inserted replaced

-:c8382f7b54ef
+:726fba06891a
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
 *  Description : A visualizer for data items with plain text.
-*  Version     : %version: tr1sido#18 %
+*  Version     : %version: tr1sido#17 %
 *
 */
+//<cmail> removed __FS_ALFRED_SUPPORT flag
+//#include <fsconfig.h>
+//</cmail> removed __FS_ALFRED_SUPPORT flag
 #include "emailtrace.h"
 #include <AknsUtils.h>
 #include <touchlogicalfeedback.h>
 #include "fstreeplaintwolineitemvisualizer.h"
 #include "fstreeplaintwolineitemdata.h"
 #include "fsgenericpanic.h"
 #include "fslayoutmanager.h"
 #include "fstextstylemanager.h"
 #include "fsmarqueeclet.h"
+// <cmail> SF
 #include <alf/alfanchorlayout.h>
 #include <alf/alfimagevisual.h>
 #include <alf/alfviewportlayout.h>
 #include <alf/alftextvisual.h>
 #include <alf/alfimage.h>
 #include <alf/alfenv.h>
 #include <alf/alfcontrol.h>
 #include <alf/alfevent.h>
 #include <alf/alfmappingfunctions.h>
+// </cmail>
 // ======== MEMBER FUNCTIONS ========
 // ---------------------------------------------------------------------------
 // Two-phased constructor.
 TAlfTimedPoint tpSubjTextTl, tpSubjTextBr;
 TAlfTimedPoint tpPrevTextTl, tpPrevTextBr;
 CFsLayoutManager::TFsLayoutMetrics
 mainIconMetrics = CFsLayoutManager::EFsLmListSingleDycRowPaneG1,
-markIconMetrics = CFsLayoutManager::EFsLmListSingleDycRowPaneG1,
+markIconMetrics = CFsLayoutManager::EFsLmListSingleDycRowPaneG4,
 menuIconMetrics = CFsLayoutManager::EFsLmListSingleDycRowPaneG3,
 sizeMetrics     = CFsLayoutManager::EFsLmListSingleDycRowPane,
 exSizeMetrics   = CFsLayoutManager::EFsLmListSingleFsDycPane,
 preSizeMetrics  = CFsLayoutManager::EFsLmListSingleFsDycPane,
 flagIconMetrics = CFsLayoutManager::EFsLmListSingleDycRowPaneG1;
 iDateTimeTextVisual->SetOpacity(opacity);
 }
 if (aData->IsIconSet())
 {
-if ( iFlags & KFsTreeListMarkingMode )
+if (iFlags & KFsTreeListItemMarked)
 {
 if ((iFlags & KFsTreeListItemHasMenu)
 && (iFlags & KFsTreeListItemFocused))
 {
 //mainIcon + markIcon + menuIcon
 }
 else
 {
 //mainIcon + markIcon
 mainIconMetrics =
-CFsLayoutManager::EFsLmListSingleDycRowPaneG2;
+CFsLayoutManager::EFsLmListSingleDycRowPaneG1;
-mainIconVariety = 2;
+mainIconVariety = 4;
 markIconMetrics =
-CFsLayoutManager::EFsLmListSingleDycRowPaneG1;
+CFsLayoutManager::EFsLmListSingleDycRowPaneG4;
-markIconVariety = 2;
+markIconVariety = 3;
-firstLineTextParentVariety = 2;
+firstLineTextParentVariety = 4;
 if (firstLineTextFields==1)
 {
 firstLineTextMetrics[0] =
 CFsLayoutManager::EFsLmListSingleDycRowTextPaneT1;
 firstLineTextVarieties[0] = 4;
 }
 else if (firstLineTextFields==2)
 {
 firstLineTextMetrics[0] =
 CFsLayoutManager::EFsLmListSingleDycRowTextPaneT1;
-firstLineTextVarieties[0] = 11;
+firstLineTextVarieties[0] = 13;
 firstLineTextMetrics[1] =
 CFsLayoutManager::EFsLmListSingleDycRowTextPaneT2;
-firstLineTextVarieties[1] = 2;
+firstLineTextVarieties[1] = 4;
 }
 }
 }
 else
 {
 {
 secondLineTextMetrics = CFsLayoutManager::EFsLmListSingleDycRowTextPaneT1;
 secondLineTextVariety = 8;
 }
 }
+//<cmail> ???
 thirdLineTextMetrics = CFsLayoutManager::EFsLmListSingleDycRowTextPaneT1;
 thirdLineTextVariety = 4;
+//</cmail>
 }
 else
 {
 firstLineTextFields = 3;
 opacity.SetValueNow(0.0f);
 iIconFlagVisual->SetOpacity(opacity);
 }
 }
-if ( iFlags & KFsTreeListMarkingMode && iIconMark )
+if ( IsMarked() && iIconMarked )
 {
+if (iIconMarked)
-TRect iconRowParent = currentSize;
+{
-if (markIconRow > 0)
+TRect iconRowParent = currentSize;
-{
+if (markIconRow > 0)
-CFsLayoutManager::LayoutMetricsRect(currentSize, CFsLayoutManager::EFsLmListSingleDycRowPane, iconRowParent, markIconRow, markIconRow);
+{
-}
+CFsLayoutManager::LayoutMetricsRect(currentSize, CFsLayoutManager::EFsLmListSingleDycRowPane, iconRowParent, markIconRow, markIconRow);
-CFsLayoutManager::LayoutMetricsRect(
+}
-iconRowParent,
+CFsLayoutManager::LayoutMetricsRect(
-markIconMetrics,
+iconRowParent,
-rect,
+markIconMetrics,
-markIconVariety);
+rect,
+markIconVariety);
 tpMarkIconTl.SetTarget(TAlfRealPoint(rect.iTl));
 tpMarkIconBr.SetTarget(TAlfRealPoint(rect.iBr));
-TInt iconMarkedVisIndex = iLayout->FindVisual(iIconMark);
+TInt iconMarkedVisIndex =
+iLayout->FindVisual(iIconMarked);
 if ( iconMarkedVisIndex != KErrNotFound )
 {
 tpMarkIconTl.SetStyle(EAlfTimedValueStyleSineWave);
 iLayout->SetAnchor(EAlfAnchorTopLeft,
 iconMarkedVisIndex,
 EAlfAnchorOriginLeft,EAlfAnchorOriginTop,
 EAlfAnchorMetricAbsolute,EAlfAnchorMetricAbsolute,
 tpMarkIconTl );
 tpMarkIconBr.SetStyle(EAlfTimedValueStyleSineWave);
 iLayout->SetAnchor(EAlfAnchorBottomRight,
 iconMarkedVisIndex,
 EAlfAnchorOriginLeft,EAlfAnchorOriginTop,
 EAlfAnchorMetricAbsolute,EAlfAnchorMetricAbsolute,
 tpMarkIconBr );
-	        opacity.SetValueNow(1.0f);
+}
-iIconMark->SetOpacity(opacity);
+}
-}
+opacity.SetValueNow(1.0f);
+iIconMarked->SetOpacity(opacity);
 }
 else
 {
-if (iIconMark)
+if (iIconMarked)
-{
+	{
-opacity.SetValueNow(0.0f);
+	opacity.SetValueNow(0.0f);
-iIconMark->SetOpacity(opacity);
+	iIconMarked->SetOpacity(opacity);
-}
+	}
 }
 if ( iPreviewPaneTextVisual )
 {
 if ( IsPreviewPaneOn() && ((iFlags & KFsTreeListItemAlwaysExtended) ||
 }
 }
 }
 iLayout->UpdateChildrenLayout();
+// </cmail>
 }
 // ---------------------------------------------------------------------------
 // From class MFsTreeItemVisualizer.
 // A call to this function means that the item is requested to draw itself
 iSecondaryTextVisual = CAlfTextVisual::AddNewL(iOwnerControl,
 iSecViewport);
 iSecondaryTextVisual->SetFlag( EAlfVisualFlagIgnorePointer );
 }
-if (!iIconMark)
+if (!iIconMarked)
 {
-iIconMark = CAlfImageVisual::AddNewL( iOwnerControl, iLayout );
+iIconMarked = CAlfImageVisual::AddNewL( iOwnerControl, iLayout );
-iIconMark->SetScaleMode( CAlfImageVisual::EScaleFit );
+iIconMarked->SetScaleMode( CAlfImageVisual::EScaleFit );
-iIconMark->SetFlag( EAlfVisualFlagIgnorePointer );
+iIconMarked->SetFlag( EAlfVisualFlagIgnorePointer );
 }
 if (!iIconMenu)
 {
-iIconMenu = CAlfImageVisual::AddNewL(iOwnerControl, iLayout);
+iIconMenu =
+CAlfImageVisual::AddNewL(iOwnerControl, iLayout);
 iIconMenu->SetScaleMode( CAlfImageVisual::EScaleFit );
 iIconMenu->SetFlag( EAlfVisualFlagIgnorePointer );
 }
 if (!iIconFlagVisual)
 // ---------------------------------------------------------------------------
 //
 void CFsTreePlainTwoLineItemVisualizer::UpdateL( const MFsTreeItemData& aData,
 TBool aFocused,
 const TUint aLevel,
-CAlfTexture*& aMarkOnIcon,
+CAlfTexture*& aMarkIcon,
-CAlfTexture*& aMarkOffIcon,
 CAlfTexture*& aMenuIcon,
 const TUint aTimeout,
 TBool aUpdateData)
 {
 FUNC_LOG;
 iFlags & KFsTreeListItemTextShadow);
 iDateTimeTextVisual->SetColor( textColor );
 iDateTimeTextVisual->SetTextStyle( styleId );
 }
-if ( IsMarked() && iIconMark && aMarkOnIcon )
+if ( IsMarked() && iIconMarked && aMarkIcon )
 {
-iIconMark->SetScaleMode( CAlfImageVisual::EScaleFit );
+iIconMarked->SetScaleMode( CAlfImageVisual::EScaleFit );
-iIconMark->SetImage( *aMarkOnIcon );
+iIconMarked->SetImage( *aMarkIcon );
-}
-else if ( !IsMarked() && iIconMark && aMarkOffIcon )
-{
-iIconMark->SetScaleMode( CAlfImageVisual::EScaleFit );
-iIconMark->SetImage( *aMarkOffIcon );
 }
 //menu icon - visible only when item is focused
 if ((iFlags & KFsTreeListItemHasMenu) && (iFlags & KFsTreeListItemFocused))
 {

branch	RCL_3
changeset 80	726fba06891a
parent 73	c8382f7b54ef