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

equal deleted inserted replaced

-:c8382f7b54ef
+:726fba06891a
 #include <StringLoader.h>
 #include <avkon.rsg> // R_AVKON_EMPTY_POPUP_LIST_TEXT
 #include <centralrepository.h>
 //////TOOLKIT INCLUDES
+// <cmail> SF
 #include <alf/alfstatic.h>
 #include <alf/alfownership.h>
 #include <alf/alfevent.h>
 #include <alf/alfimage.h>
 #include <alf/alfenv.h>
 #include <alf/alfmetric.h>
 #include <alf/alftimedvalue.h>
 //visuals
 #include <alf/alfvisual.h>
 #include <alf/alfimagevisual.h>
+// </cmail>
 //////PROJECT INCLUDES
 #include "fstreevisualizerbase.h"
 #include "fstreeplainrootvisualizer.h"
 {
 // First find first visible item using binary search algorithm
 aItems.Reset();
 TInt i(0);
 aOffset = 0;
+aBeginIndex = KErrNotFound;
 if (aY > Height())
 {
 aHeight = -1;
 }
 else if (aY > 0)
 // ---------------------------------------------------------------------------
 //  Sets icon for a mark sign.
 // ---------------------------------------------------------------------------
 //
-void CFsTreeVisualizerBase::SetMarkOnIcon(CAlfTexture& aMarkOnIcon)
+void CFsTreeVisualizerBase::SetMarkIcon(CAlfTexture& aMarkIcon)
 {
 FUNC_LOG;
-iMarkOnIcon = &aMarkOnIcon;
+iMarkIcon = &aMarkIcon;
-}
-// ---------------------------------------------------------------------------
-//  Sets icon for a unmark sign.
-// ---------------------------------------------------------------------------
-//
-void CFsTreeVisualizerBase::SetMarkOffIcon(CAlfTexture& aMarkOffIcon)
-{
-FUNC_LOG;
-iMarkOffIcon = &aMarkOffIcon;
 }
 // ---------------------------------------------------------------------------
 //  Returns icon used to mark items.
 // ---------------------------------------------------------------------------
 //
-CAlfTexture* CFsTreeVisualizerBase::MarkOnIcon()
+CAlfTexture* CFsTreeVisualizerBase::MarkIcon()
 {
 FUNC_LOG;
-return iMarkOnIcon;
+return iMarkIcon;
-}
-// ---------------------------------------------------------------------------
-//  Returns icon used to unmark items.
-// ---------------------------------------------------------------------------
-//
-CAlfTexture* CFsTreeVisualizerBase::MarkOffIcon()
-{
-FUNC_LOG;
-return iMarkOffIcon;
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 {
 MFsTreeItemData* data = NULL;
 data = &(iTreeData->ItemData(aItemId));
 vis->UpdateL(*data, IsItemFocused(aItemId) && IsFocusShown(),
-iTreeData->Level(aItemId), iMarkOnIcon, iMarkOffIcon, iMenuIcon);
+iTreeData->Level(aItemId), iMarkIcon, iMenuIcon);
 }
 }
 // ---------------------------------------------------------------------------
 //
 MFsTreeItemData* data = &iTreeData->ItemData(
 iFocusedItem);
 MakeSelectorVisibleL(EFalse);
 visualizer->UpdateL(*data, EFalse,
 iTreeData->Level(iFocusedItem),
-iMarkOnIcon, iMarkOffIcon,
+iMarkIcon, iMenuIcon, iCurrentScrollSpeed);
-iMenuIcon, iCurrentScrollSpeed);
 }
 }
 }
 }
 iListLayout->UpdateChildrenLayout();
-}
-}
-}
-// ---------------------------------------------------------------------------
-//  The functions sets wether all item in the list should be always in
-//  extended state or in normal state.
-// ---------------------------------------------------------------------------
-//
-void CFsTreeVisualizerBase::SetMarkingModeL( TBool aMarkingMode )
-{
-FUNC_LOG;
-// Do not change this to: IsMarkingMode() != aAlwaysExtended, because
-// it will not work. TBool is defined as TInt and thus this comparison
-// comes out as TInt != TInt, which always evaluates true in this case.
-if ( ( IsMarkingMode() && !aMarkingMode ) ||
-( !IsMarkingMode() && aMarkingMode ) )
-{
-iFlags.Assign(EMarkingMode, aMarkingMode);
-TFsTreeIterator treeIter(
-iTreeData->Iterator(KFsTreeRootID, KFsTreeRootID));
-while (treeIter.HasNext())
-{
-TFsTreeItemId itemId(treeIter.Next());
-if (itemId != KFsTreeNoneID && !iTreeData->IsNode(itemId))
-{
-MFsTreeItemVisualizer* itemviz(iTreeData->ItemVisualizer(itemId));
-ApplyListSpecificValuesToItem(itemviz);
-}
-}
-const TBool isUpdating(iWorld.IsUpdating());
-if (!isUpdating)
-{
-iWorld.BeginUpdate();
-}
-iWorld.RemoveAllL();
-treeIter = iTreeData->Iterator(KFsTreeRootID, KFsTreeRootID,
-KFsTreeIteratorSkipCollapsedFlag);
-while (treeIter.HasNext())
-{
-TFsTreeItemId itemId(treeIter.Next());
-if (itemId != KFsTreeNoneID)
-{
-MFsTreeItemVisualizer* itemviz(iTreeData->ItemVisualizer(itemId));
-iWorld.AppendL(itemId, itemviz->Size());
-}
-}
-iViewPort.ClearCache();
-if (!isUpdating)
-{
-iWorld.EndUpdateL();
 }
 }
 }
 // ---------------------------------------------------------------------------
 visualizer = iTreeData->ItemVisualizer( iFocusedItem );
 if ( visualizer )
 {
 visualizer->UpdateL( iTreeData->ItemData( iFocusedItem ), EFalse,
-		iTreeData->Level( iFocusedItem ), iMarkOnIcon, iMarkOffIcon, iMenuIcon, 0 );
+		iTreeData->Level( iFocusedItem ), iMarkIcon, iMenuIcon, 0 );
 }
 iFocusedItem = aItemId;
 }
 visualizer = iTreeData->ItemVisualizer( iFocusedItem );
 if ( visualizer )
 {
 visualizer->UpdateL( iTreeData->ItemData( iFocusedItem ), IsFocusShown(),
-iTreeData->Level( iFocusedItem ), iMarkOnIcon,
+iTreeData->Level( iFocusedItem ), iMarkIcon, iMenuIcon, 0 );
-iMarkOffIcon, iMenuIcon, 0 );
 }
 if ( iFocusedItem != KFsTreeNoneID )
 {
 UpdateSelectorVisualL();
 // ---------------------------------------------------------------------------
 // Sets an item as first visible one in the list.
 // ---------------------------------------------------------------------------
 //
+// <cmail>
 void CFsTreeVisualizerBase::SetFirstVisibleItemL(const TFsTreeItemId /*aItemId*/)
 {
 FUNC_LOG;
 }
 {
 FUNC_LOG;
 TFsTreeItemId retId = KFsTreeNoneID;
 if (iVisibleItems.Count())
 {
+// <cmail>
+//        TRAP_IGNORE( ClearVisibleItemsListL(EFalse) );
+// </cmail>
 retId = iVisibleItems[0];
 }
 else
 {
 retId = KFsTreeNoneID;
 // ---------------------------------------------------------------------------
 // Displays the list.
 // ---------------------------------------------------------------------------
 //
+// <cmail>
 void CFsTreeVisualizerBase::ShowListL(const TBool aFadeIn,
 const TBool aSlideIn)
 {
 FUNC_LOG;
 iVisualizationState = EFsTreeVisible;
 if (iTreeData->Count() == 0)
 {
 iRootVisualizer->ShowL(*iRootLayout);
-iRootVisualizer->UpdateL(*iRootData, EFalse, 0, iMarkOnIcon,
+iRootVisualizer->UpdateL(*iRootData, EFalse, 0, iMarkIcon, iMenuIcon);
-iMarkOffIcon, iMenuIcon);
 }
 else
 {
 const TBool showFocus = IsFocusShown();
 for (TUint i = 0; i < iVisibleItems.Count(); ++i)
 TBool itemFocused( showFocus && IsItemFocused(itemId) );
 			if ( visualizer )
 				{
 	        	visualizer->UpdateL(iTreeData->ItemData(itemId), itemFocused,
-	                iTreeData->Level(itemId), iMarkOnIcon, iMarkOffIcon, iMenuIcon,
+	                iTreeData->Level(itemId), iMarkIcon, iMenuIcon,
 	                0);
 				}
 }
 }
 UpdateViewPortL();
 iFadeEffect->FadeIn();
 iSlideEffect->SlideIn(slideInDir);
 UpdateScrollBarL();
 }
+// </cmail>
 // ---------------------------------------------------------------------------
 // The function assures that the list view is correct.
 // ---------------------------------------------------------------------------
 //
 if (vis)
 {
 vis->UpdateL(iTreeData->ItemData(aItemId),
 IsItemFocused(aItemId) && IsFocusShown(),
 iTreeData->Level(aItemId),
-iMarkOnIcon, iMarkOffIcon, iMenuIcon, 0);
+iMarkIcon, iMenuIcon, 0);
 }
 }
 }
 // ---------------------------------------------------------------------------
 //
 TBool CFsTreeVisualizerBase::IsItemsAlwaysExtended()
 {
 FUNC_LOG;
 return iFlags.IsSet(EItemsAlwaysExtended);
-}
-// ---------------------------------------------------------------------------
-//  The function returns if marking mode is on or off
-// ---------------------------------------------------------------------------
-//
-TBool CFsTreeVisualizerBase::IsMarkingMode()
-{
-FUNC_LOG;
-return iFlags.IsSet(EMarkingMode);
 }
 // ---------------------------------------------------------------------------
 // Set the background texture, clears the background color.
 // ---------------------------------------------------------------------------
 if (!iWatermark)
 {
 iWatermark
 = CFsWatermark::NewL(*iOwnerControl, *iWatermarkLayout);
 }
+// <cmail>
 iWatermark->SetWatermarkTextureL(*aTexture);
+// </cmail>
 }
 else
 {
 delete iWatermark;
 iWatermark = NULL;
 iPhysics->StopPhysics();
 }
 if (!iWorld.IsUpdating())
 {
 iRootVisualizer->ShowL(*iRootLayout);
-iRootVisualizer->UpdateL(*iRootData, EFalse, 0, iMarkOnIcon,
+iRootVisualizer->UpdateL(*iRootData, EFalse, 0, iMarkIcon,
-iMarkOffIcon, iMenuIcon);
+iMenuIcon);
 }
 iVisibleItems.Reset();
 iWorld.RemoveAllL();
 iFocusedItem = KFsTreeNoneID;
 }
 itemId);
 if (visualizer)
 {
 visualizer->UpdateL(iTreeData->ItemData(itemId),
 IsItemFocused(itemId), iTreeData->Level(itemId),
-iMarkOnIcon, iMarkOffIcon, iMenuIcon, 0);
+iMarkIcon, iMenuIcon, 0);
 }
 }
 break;
 default:
 {
 FUNC_LOG;
 if (iTreeData->Count() == 0)
 {
 iRootVisualizer->ShowL(*iRootLayout);
-iRootVisualizer->UpdateL(*iRootData, EFalse, 0, iMarkOnIcon,
+iRootVisualizer->UpdateL(*iRootData, EFalse, 0, iMarkIcon, iMenuIcon);
-iMarkOffIcon, iMenuIcon);
 }
 else
 {
 }
 }
 }
 }
 if (iVisualizationState == EFsTreeVisible && iVisualizerObserver)
 {
-TRAP_IGNORE(iVisualizerObserver->TreeVisualizerEventL(
+// <cmail> Touch
+TRAP_IGNORE(iVisualizerObserver->TreeVisualizerEventL(
 MFsTreeVisualizerObserver::EFsTreeListVisualizerShown,
 KFsTreeNoneID ));
+// </cmail>
 }
 if (iVisualizationState == EFsTreeHidden && iVisualizerObserver)
 {
-TRAP_IGNORE(iVisualizerObserver->TreeVisualizerEventL(
+// <cmail> Touch
+TRAP_IGNORE(iVisualizerObserver->TreeVisualizerEventL(
 MFsTreeVisualizerObserver::EFsTreeListVisualizerHidden,
 KFsTreeNoneID ));
+// </cmail>
 }
 }
 // ---------------------------------------------------------------------------
 // From MFsSlideEffectObserver
 }
 }
 if (iVisualizationState == EFsTreeVisible && iVisualizerObserver)
 {
-TRAP_IGNORE(iVisualizerObserver->TreeVisualizerEventL(
+// <cmail> Touch
+TRAP_IGNORE(iVisualizerObserver->TreeVisualizerEventL(
 MFsTreeVisualizerObserver::EFsTreeListVisualizerShown,
 KFsTreeNoneID ));
 }
 if (iVisualizationState == EFsTreeHidden && iVisualizerObserver)
 {
 TRAP_IGNORE(iVisualizerObserver->TreeVisualizerEventL(
 MFsTreeVisualizerObserver::EFsTreeListVisualizerHidden,
 KFsTreeNoneID ));
+// </cmail>
 }
 }
 // ---------------------------------------------------------------------------
 // From MAlfActionObserver
 MFsTreeItemVisualizer* visualizer = iTreeData->ItemVisualizer(itemId);
 if (visualizer)
 {
 visualizer->UpdateL(iTreeData->ItemData(itemId),
 					IsItemFocused(itemId) && IsFocusShown(),
-iTreeData->Level(itemId), iMarkOnIcon, iMarkOffIcon,
+iTreeData->Level(itemId), iMarkIcon, iMenuIcon, 0, EFalse);
-iMenuIcon, 0, EFalse);
 }
 }
 UpdateSelectorVisualL();
 }
 CAlfImageBrush* border = CAlfImageBrush::NewL(iOwnerControl->Env(),
 TAlfImage(*aBorderTexture));
 border->SetLayer(EAlfBrushLayerBackground);
 border->SetBorders(-8, -8, -8, -8);
+//<cmail>
+// layout values needed here (not: only used from FS action menu)
+//</cmail>
 iBorderLayout->SetPadding(TPoint(5, 5));
 if (iBorderLayout->Brushes()->Count() > 0)
 {
 iBorderLayout->Brushes()->Remove(0);
 MFsTreeItemVisualizer *aItemVis)
 {
 FUNC_LOG;
 //list can have all items in extended or in a normal state
 aItemVis->SetAlwaysExtended(IsItemsAlwaysExtended());
-aItemVis->SetMarkingMode(IsMarkingMode());
 //global indentation in pixels for a list component
 aItemVis->SetIndentation(iLevelIndentation);
 //global indentation in pixels for a list component
 isFocused = ETrue;
 }
 }
 return isFocused;
 }
+// <cmail> "Base class modifications for using touch"
 // ---------------------------------------------------------------------------
 //  C++ constructor.
 // ---------------------------------------------------------------------------
 //
 FUNC_LOG;
 iFlags.Set( EAutoRefresh );
 iFlags.Assign( EPopupMode, aPopUpMode );
 iFlags.Set( EExpandCollapseOnLongTap );
 }
+// </cmail>
 // ---------------------------------------------------------------------------
 //  Second phase constructor.
 // ---------------------------------------------------------------------------
 //
 }
 else
 {
 UpdatePhysicsL();
 }
+UpdateScrollBarL();
 }
 // ---------------------------------------------------------------------------
 // ViewPort updated
 // ---------------------------------------------------------------------------
 			{
 			MFsTreeItemVisualizer* visualizer = iTreeData->ItemVisualizer(
 											itemId);
 			visualizer->UpdateL(iTreeData->ItemData(itemId),
 							IsItemFocused(itemId) && IsFocusShown(),
-							iTreeData->Level(itemId), iMarkOnIcon,
+							iTreeData->Level(itemId), iMarkIcon, iMenuIcon,
-							iMarkOffIcon, iMenuIcon, 0);
+							0);
 			}
 		}
 	CleanupStack::PopAndDestroy();
 	}
 TAlfTimedPoint tpItemSize( listInnerWidth, size.iHeight );
 CAlfLayout& visualizerLayout(visualizer->Layout());
 visualizerLayout.SetSize(tpItemSize);
 	visualizer->UpdateL(iTreeData->ItemData(itemId),
 IsItemFocused(itemId) && IsFocusShown(),
-iTreeData->Level(itemId), iMarkOnIcon, iMarkOffIcon, iMenuIcon,
+iTreeData->Level(itemId), iMarkIcon, iMenuIcon,
 0);
 visualizerLayout.PropertySetIntegerL(KPropertyItemId(), itemId);
 visualizerLayout.Brushes()->AppendL(iBorderBrush,
 EAlfDoesNotHaveOwnership);
 CAlfBrush* bgBrush(NULL);
 TBool CFsTreeVisualizerBase::IsFocusShown()
 {
 return ( iTouchPressed || iFocusVisible ) && iFlags.IsClear( EListPanning );
 }
+// </cmail>

branch	RCL_3
changeset 80	726fba06891a
parent 73	c8382f7b54ef