MCL/sf/app/conversations: comparison imstutils/imconversationview/imcvuiapp/src/cimcvappsmileicongrid.cpp

equal deleted inserted replaced

-:36d367c62acb
+:76f25fb7a6a1
 #include <aknappui.h>
 #include <aknlayoutscalable_avkon.cdl.h>
 #include <AknDef.h>
 #include "imcvlogger.h"
 #include "imcvuiapputils.h"
 #include "mimcvtapeventobserver.h"
 // CONSTANTS
+// The (KTopLeft_x,KTopLeft_y) and (KBottomRight_x,KBottomRight_y) are the co ordinates of the
-// -- The (KTopLeft_x,KTopLeft_y) and (KBottomRight_x,KBottomRight_y) are the co ordinates of the
+// topleft and bottomright points of the first cell in the grid.
-// topleft and bottomright points of the first cell in the grid.
+// These co-ordinates to draw the grid lines and the logic to draw the grid lines is based on the topleft
-// These co-ordinates to draw the grid lines and the logic to draw the grid lines is based on the topleft
+// and bottomright points of the first cell in the grid.
-//and bottomright points of the first cell in the grid
 #define KTopLeft_x 56
 #define KTopLeft_y 55
 #define KBottomRight_x 105
 #define KBottomRight_y 104
 // ================= MEMBER FUNCTIONS =======================
 // -----------------------------------------------------------------------------
 // CIMCVAppSmileIconGrid::NewL
 	MAknsSkinInstance* skin = AknsUtils::SkinInstance();
 	MAknsControlContext* cc = AknsDrawUtils::ControlContext( this );
 	if( !iDragEvent )
 		{
-		//draw the grid
+		// Draw the grid
 		gc.SetPenStyle(CGraphicsContext::ESolidPen);
 		gc.SetBrushStyle(CGraphicsContext::ENullBrush);
 		gc.SetPenSize(TSize(1,1));
 		gc.SetPenColor(AKN_LAF_COLOR(215));
 			}
 	TInt lastRowIconsCount = iIconCount % iMaxColumns;
 		if( lastRowIconsCount == 0 && iIconCount > 0 )
 			{
-			// last row is full
+			// Last row is full
 	    lastRowIconsCount = iMaxColumns;
 			}
 		TInt i( 0 );
 		TPoint cellLeftTop( KTopLeft_x,KTopLeft_y );
 		TPoint cellBottomRight( KBottomRight_x,KBottomRight_y );
 		if(!iIsMirrored)
 			{
-			//draw horizontal lines
+			// Draw horizontal lines
 			for( i = 0; i <= iRowCount; ++i )
 				{
 				TPoint startPoint( cellLeftTop );
 				TPoint endPoint( cellLeftTop );
 				startPoint.iY += i * iCellHeight;
 				// add 1 pixel to remove the gap from bottom right corners
 				++endPoint.iX;
 				gc.DrawLine( startPoint, endPoint );
 				}
-			//draw vertical lines
+			// Draw vertical lines
-	for( i = 0; i <= iMaxColumns; ++i )
+			for( i = 0; i <= iMaxColumns; ++i )
 				{
-TPoint startPoint( cellLeftTop );
+				TPoint startPoint( cellLeftTop );
-TPoint endPoint( cellLeftTop );
+				TPoint endPoint( cellLeftTop );
 				startPoint.iX += i * iCellWidth;
 				endPoint.iX += i * iCellWidth;
 				endPoint.iY += ( i <= lastRowIconsCount ?
 				    iCellHeight * iRowCount : iCellHeight * ( iRowCount - 1  ) );
 				gc.DrawLine( startPoint, endPoint );
 				}
 			}
 		else
 			{
-			//draw horizontal lines
+			// Draw horizontal lines
 			for( i = 0; i <= iRowCount; ++i )
 				{
-				TPoint startPoint( cellBottomRight.iX, cellLeftTop.iY);
+				TPoint startPoint( cellLeftTop );
-				TPoint endPoint( cellBottomRight.iX, cellLeftTop.iY );
+				TPoint endPoint( cellLeftTop );
 				startPoint.iY += i * iCellHeight;
 				endPoint.iY += i * iCellHeight;
-				endPoint.iX -= ( ( i == iRowCount ) || ( i == 0 && iRowCount == 1 )
+				endPoint.iX += ( ( i == iRowCount ) || ( i == 0 && iRowCount == 1 )
-				    ? ( lastRowIconsCount )
+								    ? ( lastRowIconsCount )
-		    * iCellWidth : iMaxColumns * iCellWidth );
+				    		    * iCellWidth : iMaxColumns * iCellWidth );
-				// sub 1 pixel to remove the gap from bottom left corners
+				// subtract one pixel to remove the gap from bottom left corners
 				--endPoint.iX;
 				gc.DrawLine( startPoint, endPoint );
 				}
-			//draw vertical lines
+			// Draw vertical lines
-	for( i = 0; i <= iMaxColumns; ++i )
+			for( i = 0; i <= iMaxColumns; ++i )
 				{
-				TPoint startPoint( cellBottomRight.iX, cellLeftTop.iY );
+				TPoint startPoint( cellLeftTop );
-				TPoint endPoint( cellBottomRight.iX, cellLeftTop.iY);
+				TPoint endPoint( cellLeftTop );
-				startPoint.iX -= i * iCellWidth;
+				startPoint.iX += i * iCellWidth;
-				endPoint.iX -= i * iCellWidth;
+				endPoint.iX += i * iCellWidth;
 				endPoint.iY += ( i <= lastRowIconsCount ?
 				    iCellHeight * iRowCount : iCellHeight * ( iRowCount - 1  ) );
 				gc.DrawLine( startPoint, endPoint );
 				}
 			}
-		//draw icons
+		// Draw icons
 		for( i = 0; i < iIconCount; ++i )
 			{
 			DrawItem( gc, skins, skin, cc, i, i == iCursorPos );
 			}
 		}
 	else
 		{
-		// only selection changed, highlight new pos
+		// Only selection changed, highlight new pos
 		DrawItem( gc, cc != NULL, skin, cc, iCursorPos, ETrue );
-		// and clear old
+		// And clear old
 		DrawItem( gc, cc != NULL, skin, cc, iPrevCursorPos, EFalse );
 		}
 	IM_CV_LOGS(TXT("CIMCVAppSmileIconGrid::Draw() end") );
 	}
 MAknsSkinInstance* aSkin,
 MAknsControlContext* aSkinCc,
 TInt aIndex, TBool aSelected ) const
 {
 IM_CV_LOGS(TXT("CIMCVAppSmileIconGrid::DrawItem() start") );
-//lets count currect cell
+//lets count current cell
 TPoint cellLeftTop( KTopLeft_x,KTopLeft_y );
 TPoint cellBottomRight( KBottomRight_x,KBottomRight_y );
 TRect myRect;
 myRect.SetRect( cellLeftTop, cellBottomRight );
 {
 	offset.iX = ( aIndex % iMaxColumns ) * iCellWidth;
 }
 else
 {
-	offset.iX = -(( aIndex % iMaxColumns ) * iCellWidth);
+	offset.iX = ( aIndex % iMaxColumns ) * iCellWidth;
 }
 offset.iY = aIndex / iMaxColumns * iCellHeight;
 myRect.Move( offset );

branch	RCL_3
changeset 13	76f25fb7a6a1
parent 12	36d367c62acb
child 14	6b620215f837