MCL/sf/app/photos: comparison photosgallery/viewframework/views/cloudview/src/glxcloudviewcontrol.cpp

equal deleted inserted replaced

-:b023a8d2866a
+:ea65f74e6de4
 #include <glxlog.h>			// For Logs
 #include <glxtracer.h>			// For Logs
 #include <glxattributecontext.h> //attribute context
 #include <mglxmedialist.h> //for medialist
-#include "glxcontainerinfobubble.h" //intelligent class for data of infobubble
 #include "glxcloudview.hrh"
 #include "mglxcloudviewmskobserver.h" // For Msk Observer
 #include "mglxenterkeyeventobserver.h" // For enterkey observer
 #include "mglxcloudviewlayoutobserver.h"
 #include "glxtagscontextmenucontrol.h"
 const TInt KFontLarger = 40;
 const TInt KFontLargest = 44;
 const TInt KRowHeight = 72;
 const TInt KLeftMargin = 10;
 const TInt KNumMinRowSpace = 2;
-const TInt KColSpace = 20;
+const TInt KColSpace = 30;
 const TInt KRightmargin = 10;//Aligning Right margin
 const TInt KMinTagSize = 77;
 const TInt KTagScreenHeight = 460;
 const TReal KBoundaryMargin = 0.1; //10% = 10/100 = 0.1
 const TInt KFastCloudMovement = 100; //Transition time to move cloud view
 // ---------------------------------------------------------------------------
 //
 TInt CGlxCloudViewControl::LayoutVisibleRows(TPoint aStartPoint,TInt aRowStartIndex
 , TInt aRowEndIndex)
 {
-TRACER("GLX_CLOUD::CGlxCloudViewControl::DrawRow");
+TRACER("CGlxCloudViewControl::LayoutVisibleRows");
 TSize vsize;
 TPoint tl, br;
 tl = aStartPoint;
+br.iX = 0;
 br.iY = tl.iY + KRowHeight;
+const TInt KMaxScreenWidth = iTagScreenWidth - iScrollPaneHandle.iW;
 //drawing in reverse for arabic hebrew support
 if ( GlxGeneralUiUtilities::LayoutIsMirrored ())
 {
-br.iX =  aStartPoint.iX;
+		GLX_LOG_INFO("Mirrorred Layout");
-const TInt KMaxScreenWidth = iTagScreenWidth - iScrollPaneHandle.iW;
+		//In Mirrored layout, 'BottomRight' considers scrollpane width for each row
+br.iX =  aStartPoint.iX  - iScrollPaneHandle.iW;
 //Set the positions of tags in a row.
 for (TInt j = aRowStartIndex; j <= aRowEndIndex; j++)
 {
-vsize = iLabels[j]->TextExtents ();
+vsize = iLabels[j]->TextExtents();
 if ( vsize.iWidth < KMinTagSize )
 {
 vsize.iWidth = KMinTagSize;
 }
 //If the size of the tag is more than the screen size then wrap it
 if (vsize.iWidth > KMaxScreenWidth)
 {
 TAlfRealSize tagSize( KMaxScreenWidth, br.iY );
 iLabels[j]->SetWrapping( CAlfTextVisual::ELineWrapTruncate );
-vsize = iLabels[j]->TextExtents ();
 tl.iX -= aStartPoint.iX;
 tl.iY = aStartPoint.iY;
 br.iX = tagSize.iWidth;
 }
 else
 {
-tl.iX -= (vsize.iWidth + KColSpace);
+				tl.iX = br.iX - vsize.iWidth;
 }
 //Set the anchor points for the tags
 iLayout->SetAnchor (EAlfAnchorTopLeft, iLayoutIndex,
 EAlfAnchorOriginLeft, EAlfAnchorOriginTop,
 EAlfAnchorMetricAbsolute, EAlfAnchorMetricAbsolute,
 TAlfTimedPoint (tl.iX, tl.iY));
 iLayout->SetAnchor (EAlfAnchorBottomRight, iLayoutIndex,
 EAlfAnchorOriginLeft, EAlfAnchorOriginTop,
 EAlfAnchorMetricAbsolute, EAlfAnchorMetricAbsolute,
 TAlfTimedPoint (br.iX, br.iY));
+//Bottom-Right corner for next tag in same row
 br.iX -= (vsize.iWidth + KColSpace);
 iLayoutIndex += 1;
 }
 }
 else
 {
-const TInt KMaxScreenWidth = iTagScreenWidth - iScrollPaneHandle.iW;
+		GLX_LOG_INFO("NOT Mirrorred Layout");
 for (TInt j = aRowStartIndex; j <= aRowEndIndex; j++)
 {
-vsize = iLabels[j]->TextExtents ();
+vsize = iLabels[j]->TextExtents();
 if( vsize.iWidth < KMinTagSize )
 {
 vsize.iWidth = KMinTagSize;
 }
 if (vsize.iWidth > KMaxScreenWidth)
 {
 TAlfRealSize tagSize( KMaxScreenWidth, br.iY );
-TAlfRealPoint startPos( aStartPoint.iX, 0 );
 iLabels[j]->SetWrapping( CAlfTextVisual::ELineWrapTruncate );
 tl.iX = aStartPoint.iX;
 tl.iY = aStartPoint.iY;
 br.iX = tagSize.iWidth;
 }
 else
 {
-br.iX += vsize.iWidth + KColSpace;
+br.iX = tl.iX + vsize.iWidth;
 }
 iLayout->SetAnchor (EAlfAnchorTopLeft, iLayoutIndex,
 EAlfAnchorOriginLeft, EAlfAnchorOriginTop,
 EAlfAnchorMetricAbsolute, EAlfAnchorMetricAbsolute,
 TAlfTimedPoint (tl.iX, tl.iY));
 iLayout->SetAnchor (EAlfAnchorBottomRight, iLayoutIndex,
 EAlfAnchorOriginLeft, EAlfAnchorOriginTop,
 EAlfAnchorMetricAbsolute, EAlfAnchorMetricAbsolute,
 TAlfTimedPoint (br.iX, br.iY));
-tl.iX = br.iX;
+//Top-Left Corner for next tag in same row
+tl.iX += (vsize.iWidth + KColSpace);
 iLayoutIndex += 1;
 }
 }
 return 0;
 }
 // ---------------------------------------------------------------------------
 // LayoutVisibleArea()
 //
 // ---------------------------------------------------------------------------
 void CGlxCloudViewControl::LayoutVisibleArea()
 {
+	TRACER("CGlxCloudViewControl::LayoutVisibleArea");
 //screen height for boundary check:how many rows fit in.
 //find out how many rows can fit in.
 //add upper and lower margin spacing 5 pixels
 //draw the row on screens
 //If the layout is arabic hebrew then start positioning of tags from end
 if ( GlxGeneralUiUtilities::LayoutIsMirrored ())
 {
 startpoint.iX = iTagScreenWidth - KRightmargin;
 }
+//else start from beginning
-//else start from biginning
 else
 {
 startpoint.iX = KLeftMargin;
 }
 startpoint.iY = KNumMinRowSpace;
 //associate the active visuals with anchor layout
 GLX_LOG_INFO("GLX_CLOUD ::CGlxCloudViewControl::::LayoutVisibleArea Layout reset");
 GLX_LOG_INFO1("GLX_CLOUD ::CGlxCloudViewControl::::LayoutVisibleArea layout Count after reset  %d ", iLayout->Count ());
 GLX_LOG_INFO1("GLX_CLOUD ::CGlxCloudViewControl::::LayoutVisibleArea iCloudInfo[0].iStartIndex  %d ", iCloudInfo[0].iStartIndex);
 TInt endindex = iCloudInfo.Count()-1;
 for (TInt j = iCloudInfo[0].iStartIndex; j <=iCloudInfo[endindex].iEndIndex; j++)
 {
 GLX_LOG_INFO("GLX_CLOUD ::CGlxCloudViewControl::::FindEndRowIndex Entering layout append");
 TAlfTimedValue opacity;
 opacity.SetValueNow(1.0); // immediate change
 iLabels[j]->SetOpacity(opacity);
 }
 {
 ((IAlfScrollBarModel *)(iScrollBarWidget->model()))->changeData(iScrollEventData.mSpan,
 iScrollEventData.mViewLength,
 0);
 DisplayScrollBar();
 }
-//constructing the bubblecontainer
-CreateBubleContainer();
 iLayout->UpdateChildrenLayout (); //update layout
 HandleLayoutFocusChange ();
 MoveDownIfRequired();
 }
 // ---------------------------------------------------------------------------
 // OfferEventL()
 // ---------------------------------------------------------------------------
 //
 }
 iScrollDirection = 1;
 }
 // ---------------------------------------------------------------------------
 // HandleKeyDown()
 // ---------------------------------------------------------------------------
 //
 void CGlxCloudViewControl::HandleKeyDownL()
 //to highlight focused element
 SetFocusColor();
 }
 }
 // ---------------------------------------------------------------------------
 // FocusUpdate()
 // ---------------------------------------------------------------------------
 //
 void CGlxCloudViewControl::FocusUpdate()
 iFocusRowIndex = RowNumber (iMediaList.FocusIndex ());
 iEndRowIndex = iCloudInfo.Count()-1;
 LayoutVisibleArea();
 }
 // ---------------------------------------------------------------------------
 // ResetLayout()
 // ---------------------------------------------------------------------------
 //
 void CGlxCloudViewControl::UpdateLayout()
 iLabels[i] = NULL;
 }
 iLabels.Reset();
 }
 // ---------------------------------------------------------------------------
 // GetRownum()
 // ---------------------------------------------------------------------------
 //
 TInt CGlxCloudViewControl::RowNumber(TInt aItemIndex) const
-{
+	{
+	TRACER("GLX_CLOUD::CGlxCloudViewControl::GetRownum");
-TRACER("GLX_CLOUD::CGlxCloudViewControl::GetRownum");
+	//Get the rownumber of the given item index.
-//Get the rownumber of the given item index.
+	TInt i;
-TInt i;
+	for (i = 0; i < iCloudInfo.Count(); i++)
-for (i = 0; i < iCloudInfo.Count (); i++)
+		{
-{
+		if ((aItemIndex >= iCloudInfo[i].iStartIndex) && (aItemIndex
-if ( (aItemIndex >= iCloudInfo[i].iStartIndex) && (aItemIndex <=iCloudInfo[i].iEndIndex))
+				<= iCloudInfo[i].iEndIndex))
-break;
+			break;
-}
+		}
-return i;
+	return i;
+	}
-}
 // ---------------------------------------------------------------------------
 // FetchAttributeFromCacheL()
 // ---------------------------------------------------------------------------
 //
 TGlxMedia item = iMediaList.Item( i );
 // get the title and set it to the text visual
 iLabels[i]->SetTextL( item.Title() );
 }
 }
 //medialist Observers
 // ---------------------------------------------------------------------------
 // HandleItemAddedL().
 UpdateRowDataL (); //updates the row data and reassigns font sizes and draw the layout on screen.
 }
 InitPhysicsL();
 }
 // ---------------------------------------------------------------------------
 // HandleMediaL().
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //UpdateRowDataL()
 // ---------------------------------------------------------------------------
 //
 void CGlxCloudViewControl::UpdateRowDataL()
 {
 TRACER("GLX_CLOUD::CGlxCloudViewControl::UpdateRowData()");
 TInt rowStartingTagIndex = 0;
 TInt lastRowStartTagIndex = 0;
 //Setting the Font Styles based on association counts
 //Finding the maximum value of image association
 //Determining the Font(Style) for each visual
-TInt maxCount= MaxUsageCount (); //Maximum Association count
+TInt maxCount = MaxUsageCount (); //Maximum Association count
 GLX_LOG_INFO1("GLX_CLOUD ::CGlxCloudViewControl::UpdateRowData  mediaCount %d ", maxCount);
 GLX_LOG_INFO1("GLX_CLOUD ::CGlxCloudViewControl::UpdateRowData  iLabels.Count()  %d ",iLabels.Count());
 if ( 0 == maxCount )
 {
 return; //do not proceed if max count is zero
 {
 rowHeight = currentTagSize.iHeight;
 }
 // Current row width will be progressively incremented to fit as many tags as possible
-rowWidth += currentTagSize.iWidth + 10;
+rowWidth += currentTagSize.iWidth + KColSpace;
 GLX_LOG_INFO1("GLX_CLOUD ::CGlxCloudViewControl::UpdateRowData   currentTagSize.iWidth %d ", currentTagSize.iWidth);
 GLX_LOG_INFO1("GLX_CLOUD ::CGlxCloudViewControl::UpdateRowData  rowWidth %d ", rowWidth);
 // If the tag size crosses the Screen Size, Then wrap it.
 if ( currentTagSize.iWidth > KMaxScreenWidth )
 // If the current row's width is overflowing the screen width
 // then we must fit the current visual into the next row.
 // Do that check now and adjust accordingly.
 // Fix for EAHN-7BZD78 is to exclude the gap value between the row's tags from the logic
-else if ( rowWidth - 10 > KMaxScreenWidth )
+else if ( rowWidth - KColSpace > KMaxScreenWidth )
 {
 GLX_LOG_INFO("GLX_CLOUD :: CGlxCloudViewControl::UpdateRowData Row added");
 lastRowStartTagIndex = currentTagIndex - 1;
 AppendToCloudArrayL( cloudInfo,rowStartingTagIndex, lastRowStartTagIndex );
 lastRowStartTagIndex++;
 void  CGlxCloudViewControl::SetFocusColor()
 {
 iLabels[iMediaList.FocusIndex()]->SetColor (KAknsIIDQsnHighlightColors ,EAknsCIQsnHighlightColorsCG3);
 }
 // ---------------------------------------------------------------------------
 // SetBubleMidPoint()
 // ---------------------------------------------------------------------------
 //
 void  CGlxCloudViewControl::SetBubleMidPoint(TPoint& aMidPoint)
 {
 TRACER("GLX_CLOUD::CGlxCloudViewControl::SetBubleMidPoint");
 //Substract the viewport position so as to set the buble at the right position on the screen
 aMidPoint.iX-=iViewPortPosition.iX;
 aMidPoint.iY-=iViewPortPosition.iY;
-}
-// ---------------------------------------------------------------------------
-// CreateBubleContainer()
-// ---------------------------------------------------------------------------
-//
-void CGlxCloudViewControl::CreateBubleContainer()
-{
 }
 // ---------------------------------------------------------------------------
 // MoveUpIfRequired()
 // ---------------------------------------------------------------------------
 }
 iViewPortLayout->SetViewportPos(iViewPortPosition, KSlowCloudMovement);
 iScrollEventData.mViewStartPos = iViewPortPosition.iY;
 Scroll();
 }
 // ---------------------------------------------------------------------------
 // MoveDownIfRequired()
 // ---------------------------------------------------------------------------
 //
 {
 TRect rect;
 AknLayoutUtils::LayoutMetricsRect (AknLayoutUtils::EMainPane, rect);
 if ((rect.Width() != (iTagScreenWidth + KRightmargin)) || (rect.Height() != iScreenHeight))
 {
-//set the new screen dimensions
+		//set the new screen dimensions
-iScreenHeight=rect.Height();
+		iScreenHeight = rect.Height();
-iTagScreenWidth = rect.Width()- KRightmargin;
+		iTagScreenWidth = rect.Width() - KRightmargin;
-if(IsLandscape())
+		if (IsLandscape())
-{
+			{
-iTagScreenHeight = rect.Height();
+			iTagScreenHeight = rect.Height();
-}
+			}
-else
+		else
-{
+			{
-iTagScreenHeight = KTagScreenHeight;
+			iTagScreenHeight = KTagScreenHeight;
-}
+			}
-iViewPortLayout->SetSize(TAlfRealSize(iTagScreenWidth,iTagScreenHeight), 0);
+		iViewPortLayout->SetSize(
-//delete all layout associations
+				TAlfRealSize(iTagScreenWidth, iTagScreenHeight), 0);
-if ( iCloudInfo.Count ()!= 0)//check for the empty cloud view
+		//delete all layout associations
-{
+		if (iCloudInfo.Count() != 0)//check for the empty cloud view
-UpdateLayout();
+			{
-FetchAttributeFromCacheL();
+			UpdateLayout();
-//generate row structures and draw rows on screen
+			FetchAttributeFromCacheL();
-UpdateRowDataL ();
+			//generate row structures and draw rows on screen
+			UpdateRowDataL();
-InitPhysicsL();
-}
+			InitPhysicsL();
-}
+			}
+		}
 }
 // ---------------------------------------------------------------------------
 // InitPhysicsL()
 // ---------------------------------------------------------------------------
 else
 {
 return EFalse;
 }
 }
 // ---------------------------------------------------------------------------
 // TimerCompleteL()
 // ---------------------------------------------------------------------------
 //
 void CGlxCloudViewControl::TimerCompleteL()
 iTagsContextMenuControl->SetViewableRect(rect);
 iTagsContextMenuControl->ShowItemMenuL(ETrue);
 iTagsContextMenuControl->SetDisplay(midpoint);
 }
 }
 // ---------------------------------------------------------------------------
 // ShowContextItemMenuL()
 // ---------------------------------------------------------------------------
 //
 void CGlxCloudViewControl::ShowContextItemMenuL(TBool aShow)

branch	RCL_3
changeset 24	ea65f74e6de4
parent 23	b023a8d2866a