FCL/sf/mw/ipconnmgmt: comparison cmmanager/cmmgr/Framework/Src/cmdesticonmap.cpp

equal deleted inserted replaced

-:c45d4fe2ff0a
+:0a9e01492035
 {
 iRows = ( ( iConsArray->Count() - 1 ) / iMaxColumns ) + 1 ;
 iFirstVisibleRow = 0;
 iAnimated = EFalse;
 iCursorPos = TPoint( 0, 0 );
-iNumPages = ( iRows / iExtension->iMaxVisibleRows ) +
-( iRows % iExtension->iMaxVisibleRows ? 1 : 0 );
-iCurrentPage = 1;
 // Create and set the scb visible even though there is nothing to scroll
 delete iSBFrame; iSBFrame=NULL;
 if ( AknLayoutUtils::PenEnabled() )
 TAknLayoutRect dialogLayRect;
 // Main pane without softkeys
 TRect mainPaneRect;
 if ( !AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, mainPaneRect ) )
 {
 mainPaneRect = iAvkonAppUi->ClientRect();
 }
 // Dialog layout, check variety first
 TAknLayoutScalableParameterLimits iconMapDialogVariety =
 AknLayoutScalable_Avkon::popup_grid_graphic_window_ParamLimits();
 TInt varietyNumber = varietyOffset - iRows - 1;
 // if more lines than possible to show, use the default
 // ( the biggest grid ) variety
 if ( varietyNumber < 0 )
-varietyNumber = 0;
+{
+varietyNumber = 0;
+}
 // if zero rows, use the minimum
 else if ( iRows<=0 )
-varietyNumber -= 1;
+{
+varietyNumber -= 1;
+}
 //add the varietyoffset
 varietyNumber += maxVarietyOffset;
 if ( Layout_Meta_Data::IsLandscapeOrientation() &&
 void CCmDestinationIconMap::HandlePointerEventL(
 const TPointerEvent& aPointerEvent )
 {
 if ( AknLayoutUtils::PenEnabled() )
 {
-TInt newGridX; // For the whole
+TInt xInPixels = aPointerEvent.iPosition.iX - iGridTopLeft.iX;
-TInt newGridY; // For the whole grid.
 TInt yInPixels = aPointerEvent.iPosition.iY - iGridTopLeft.iY;
-newGridY = yInPixels / iGridItemHeight;
+TInt newGridX = xInPixels / iGridItemWidth;
-if ( ( aPointerEvent.iPosition.iX - iGridTopLeft.iX ) < 0 )
+TInt newGridY = yInPixels / iGridItemHeight;
-{
+TInt globalY = newGridY + iFirstVisibleRow;
-newGridX = -1;
-}
-else
-{
-newGridX = ( aPointerEvent.iPosition.iX - iGridTopLeft.iX )
-/ iGridItemWidth;
-}
 // The pointer has been set down or dragged into the area of the grid.
-// (it might be in the "white space" at the end of the grid)
+// Also, it may NOT be in the "empty slots" at the end of the grid.
-if ( ( yInPixels >= 0 && yInPixels < iGridItemHeight
+if ( xInPixels >= 0 &&
-* iExtension->iMaxVisibleRows) &&
+yInPixels >= 0 &&
-// When the pointer is in rows except the recent icon row
+newGridX < iMaxColumns &&
-( ( ( ( newGridY + iFirstVisibleRow ) != 0 ) &&
+yInPixels < iGridItemHeight * iExtension->iMaxVisibleRows &&
-newGridX < iMaxColumns && newGridX >= 0 ) ||
+globalY * iMaxColumns + newGridX + 1 <= iConsArray->Count() )
-// When the pointer is in the recent icon row
+{
-( ( newGridY + iFirstVisibleRow == 0 ) &&
-( newGridX < iMaxColumns ) ) ) )
-{
-TUint globalY = newGridY + iFirstVisibleRow;
 // For any action to be taken, the pointer event must either be a
 // Button1Down or a drag event which has originated from a
 // Button1Down in to the grid.
 if ( aPointerEvent.iType == TPointerEvent::EButton1Down ||
 aPointerEvent.iType == TPointerEvent::EDrag )
 TInt varietyNumber = varietyOffset - iRows - 1;
 // if more lines than possible to show, use the default
 // ( the biggest grid ) variety
 if ( varietyNumber < 0 )
-varietyNumber = 0;
+{
+varietyNumber = 0;
+}
 // if zero rows, use the minimum
 else if ( iRows<=0 )
-varietyNumber -= 1;
+{
+varietyNumber -= 1;
+}
 //add the varietyoffset
 varietyNumber += maxVarietyOffset;
 if ( Layout_Meta_Data::IsLandscapeOrientation() &&
 location == AknLayoutUtils::EAknCbaLocationRight )
 varietyNumber = 5;
 }
 else
 {
 varietyNumber = 3;
 }
+}
-}
 TAknLayoutRect popupGridLayRect;
 popupGridLayRect.LayoutRect( mainPaneRect,
 AknLayoutScalable_Avkon::popup_grid_graphic_window( varietyNumber ) );
 // Calculate the size relatively
 {
 if ( aType == KEikDynamicLayoutVariantSwitch )
 {
 // save the old info for the magnitudes of the SCT grid
 TInt oldMaxColumns = iMaxColumns;
-//TInt oldMaxRows = 0;
-//oldMaxRows = iRows;
 // calculate the new magnitudes
 DoLayout();
 // then calculate the index position of the cursor in the icon table
 // and update the x and y positions for the new grid with it
 // how many left after the full rows
 numberOfGridCellsToBeDrawn -= fullRows * iMaxColumns;
 TPoint pos = iGridTopLeft;
-TInt endX = pos.iX + iGridItemWidth * iMaxColumns + 1;
+TInt endX = pos.iX + iGridItemWidth * iMaxColumns;
 TInt endY = pos.iY + iGridItemHeight * fullRows;
 TInt ii = 0;
 if ( fullRows )
 gc.SetPenSize( TSize( 1,1 ) );
 gc.DrawLine( pos, TPoint( pos.iX, endY ) );
 pos.iX += iGridItemWidth;
 }
 pos = iGridTopLeft;
 // Draw full horizontal lines
 for ( ii = 0 ; ii <= fullRows ; ii++ )
 {
 gc.SetPenSize( TSize( 1,1 ) );
 else // not mirrored
 pos.iX += iGridItemWidth;
 }
 }
-TInt iconIndex = ( iCurrentPage - 1 ) *
+TInt iconIndex = iFirstVisibleRow * iMaxColumns;
-( iMaxColumns * iExtension->iMaxVisibleRows );
+TInt lCnt = iConsArray->Count();
-TInt lCnt =  iConsArray->Count();
 cursorPos = iCursorPos.iX + iCursorPos.iY * iMaxColumns;
 if ( lCnt > 0 )
 {
 TRect cellRect( TPoint( 0,0 ),
 TSize( iGridItemWidth - 1, iGridItemHeight - 1 ) );
 for ( TInt j = iconIndex, i = 0;
 j < lCnt && i < numberOfIconsToBeDrawn;
 j++, i++ )
 {
-DrawItem( gc, CursorRect( i ), j, cursorPos == i, EFalse );
+DrawItem( gc, i, j, cursorPos == i, EFalse );
 }
 }
 }
 iDrawnBefore = ETrue;
 // CCmDestinationIconMap::DrawItem()
 // -----------------------------------------------------------------------------
 //
 void CCmDestinationIconMap::DrawItem(
 CWindowGc& aGc,
-const TRect& aSctPosition,
+TInt index,
 TInt aIconIndex,
 TBool aHighlighted,
 TBool aDrawBackground ) const
 {
+TRect sctPosition = CursorRect( index );
 MAknsSkinInstance* skin = AknsUtils::SkinInstance();
 MAknsControlContext* cc = AknsDrawUtils::ControlContext( this );
-TBool skins = AknsDrawUtils::Background( skin,cc,aGc, aSctPosition );
+TBool skins = AknsDrawUtils::Background( skin,cc,aGc, sctPosition );
 TRgb color;
 if ( !skins )
+{
 aGc.SetBrushStyle( CGraphicsContext::ESolidBrush );
+}
 if ( aHighlighted )
 {
 TRgb colorHightLightRect = AKN_LAF_COLOR( 215 );
 AknsUtils::GetCachedColor( skin,
 colorHightLightRect,
 KAknsIIDQsnLineColors,
 EAknsCIQsnLineColorsCG7 );
 aGc.SetPenColor( colorHightLightRect );
-aGc.DrawRect( aSctPosition );
+aGc.DrawRect( sctPosition );
 // Shrink by one pixel in all directions.
-TRect innerRect = aSctPosition;
+TRect innerRect = sctPosition;
 innerRect.Shrink( 1,1 );
 color = AKN_LAF_COLOR( 210 );
 AknsUtils::GetCachedColor( skin,
 color,
 aGc.SetBrushColor( color );
 aGc.Clear( innerRect );
 }
 else if ( aDrawBackground )
 {
-TRect innerRect = aSctPosition;
+TRect innerRect = sctPosition;
 aGc.SetBrushColor( AKN_LAF_COLOR( 0 ) );
 if ( !skins )
 {
 aGc.Clear( innerRect );
 }
 TRect cellRect( TPoint( 0,0 ),
 TSize( iGridItemWidth - 1, iGridItemHeight - 1 ) );
 CGulIcon* bitmap = NULL;
 bitmap = iConsArray->At( aIconIndex );
-TInt numIconsInaPage = iExtension->iMaxVisibleRows * iMaxColumns;
-TInt cellIndex = aIconIndex;
+aGc.BitBltMasked( CursorPoint( index ),
-if ( aIconIndex >= numIconsInaPage )
-{
-cellIndex = aIconIndex % numIconsInaPage;
-}
-aGc.BitBltMasked( CursorPoint( cellIndex ),
 bitmap->Bitmap(),
 cellRect,
 bitmap->Mask(),
 EFalse );
 }
 // items.
 TRect rect = CursorRect( aCursorPos );
 Window().Invalidate( rect );
 Window().BeginRedraw( rect );
-DrawItem( SystemGc(), rect, iconIndex, aHighlighted, ETrue );
+DrawItem( SystemGc(), aCursorPos, iconIndex, aHighlighted, ETrue );
 Window().EndRedraw();
 SystemGc().DiscardFont();
 }
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 //
 void CCmDestinationIconMap::MoveCursorL( TInt aDeltaX, TInt aDeltaY )
 {
 if ( iIsMirrored )
+{
 aDeltaX = -aDeltaX;
+}
 if ( ( iConsArray->Count() < 8 ) )
-return;
+{
+return;
+}
 iOldCursorPos = iCursorPos;
 TInt oldFirstVisibleRow = iFirstVisibleRow;
 TInt globalYPos = iCursorPos.iY + iFirstVisibleRow;
 iFirstVisibleRow += iExtension->iMaxVisibleRows;
 iCursorPos = TPoint( iCursorPos.iX, 0 );
 }
 }
-//TInt increment( 1 );
-//if ( aDeltaY < 0 || aDeltaX < 0 )
-//    {
-////    increment = -1;
-//    }
 if ( iRows > iExtension->iMaxVisibleRows &&
 ( iOldCursorPos.iY + oldFirstVisibleRow !=
 iCursorPos.iY + iFirstVisibleRow ) )
 {
 UpdateScrollIndicatorL();
 TRect parent = gridWithScrollLayRect.Rect();
 TAknWindowComponentLayout scrollbarLayout =
 AknLayoutScalable_Avkon::scroll_pane_cp5();
-iCurrentPage = ( iFirstVisibleRow / iExtension->iMaxVisibleRows ) + 1;
+vSbarModel.iScrollSpan = iRows;
-vSbarModel.iScrollSpan = iNumPages * iExtension->iMaxVisibleRows;
 vSbarModel.iThumbSpan = iExtension->iMaxVisibleRows;
-if ( iSBFrame && iSBFrame->TypeOfVScrollBar() ==
+if ( iSBFrame->TypeOfVScrollBar() == CEikScrollBarFrame::EDoubleSpan )
-CEikScrollBarFrame::EDoubleSpan )
 {
 // For EDoubleSpan type scrollbar
-vSbarModel.iThumbPosition = ( iCurrentPage - 1 ) *
+vSbarModel.iThumbPosition = iFirstVisibleRow;
-iExtension->iMaxVisibleRows;
 TAknDoubleSpanScrollBarModel hDsSbarModel( hSbarModel );
 TAknDoubleSpanScrollBarModel vDsSbarModel( vSbarModel );
 // The y coordinate must be sifted 3 pixels up and x 3 to left
 parent.iTl.iY -= KVerticalDialogMargin;
 maxVarietyOffset = varietyOffset;
 }
 else if ( location == AknLayoutUtils::EAknCbaLocationLeft )
 {
 maxVarietyOffset = varietyOffset + varietyOffset; // 2*
 }
 TInt varietyNumber = varietyOffset - iRows - 1;
 // if more lines than possible to show, use the default
 // ( the biggest grid ) variety
 if ( varietyNumber < 0 )
 // get the item height
 TInt cellHeight = cellRect.Height();
 // calculate the number of items fitting to grid
-iExtension->iMaxVisibleRows = 3;//gridHeight / cellHeight;
+iExtension->iMaxVisibleRows = 3; //gridHeight / cellHeight;
 // Store the item height
 TAknLayoutRect secondRowLayRect;
 secondRowLayRect.LayoutRect( gridLayRect.Rect(),
 AknLayoutScalable_Avkon::cell_graphic_popup_pane( 0,0,1 ) );
 {
 case EEikScrollUp:
 case EEikScrollPageUp:
 {
 // nothing done if we are already on the first page.
-if ( iFirstVisibleRow != 0 )
+if ( iFirstVisibleRow > 0 )
 {
 iFirstVisibleRow -= iExtension->iMaxVisibleRows;
+if ( iFirstVisibleRow < 0 )
+{
+iFirstVisibleRow = 0;
+}
 update = ETrue;
 }
 UpdateScrollIndicatorL();
 }
 break;
 case EEikScrollDown:
 case EEikScrollPageDown:
 {
 // nothing done if we are already on the last page.
-if ( iFirstVisibleRow != iRows/iExtension->iMaxVisibleRows *
+if ( iFirstVisibleRow < iRows - iExtension->iMaxVisibleRows )
-iExtension->iMaxVisibleRows )
 {
 iFirstVisibleRow += iExtension->iMaxVisibleRows;
+if ( iFirstVisibleRow > iRows - iExtension->iMaxVisibleRows )
+{
+iFirstVisibleRow = iRows - iExtension->iMaxVisibleRows;
+}
 update = ETrue;
 }
 UpdateScrollIndicatorL();
 }
 break;
 case EEikScrollThumbDragVert:
 {
-TInt thumbPosition;
-TInt halfPage = iExtension->iMaxVisibleRows/2;
 // Ask which type of scrollbar is shown
-//CAknAppUi* appUi = iAvkonAppUi;
+TInt thumbPosition;
+TBool isDoubleSpan = ( CEikScrollBarFrame::EDoubleSpan == iSBFrame->TypeOfVScrollBar() );
+if ( isDoubleSpan )
+{
+thumbPosition = static_cast <const TAknDoubleSpanScrollBarModel*>(
+aScrollBar->Model() )->FocusPosition();
+}
+else
+{
+thumbPosition = aScrollBar->Model()->iThumbPosition;
+}
+if ( thumbPosition != iFirstVisibleRow )
+{
+iFirstVisibleRow = thumbPosition;
+update = ETrue;
+}
+}
+break;
+case EEikScrollThumbReleaseVert:
+{
+// Ask which type of scrollbar is shown
 TBool isDoubleSpan =
 CEikScrollBarFrame::EDoubleSpan == iSBFrame->TypeOfVScrollBar();
 if ( isDoubleSpan )
 {
-thumbPosition = static_cast <const TAknDoubleSpanScrollBarModel*>(
+iFirstVisibleRow = static_cast <const TAknDoubleSpanScrollBarModel*>(
 aScrollBar->Model() )->FocusPosition();
 }
 else
 {
-thumbPosition = aScrollBar->Model()->iThumbPosition;
+iFirstVisibleRow = aScrollBar->Model()->iThumbPosition;
 }
+update = ETrue;
-// If the slider is in the range of less then a half page from a
-// possible correct thumb position. thus 0 <= iFirstVisibleRow -
-// thumbPosition < halfPage. Or in the other direction:
-// 0 <= thumbPosition - iFirstVisibleRow < halfPage
-if ( !( ( 0 <= iFirstVisibleRow - thumbPosition &&
-iFirstVisibleRow - thumbPosition < halfPage )||
-( 0 <= thumbPosition - iFirstVisibleRow &&
-thumbPosition - iFirstVisibleRow < halfPage ) ) )
-{
-TReal toRound = thumbPosition /
-( TReal )iExtension->iMaxVisibleRows;
-if ( toRound * 2 > ( TInt )toRound * 2 + 1 )
-{
-toRound++;
-}
-iFirstVisibleRow = ( TInt )toRound *
-iExtension->iMaxVisibleRows;
-update = ETrue;
-}
-}
-break;
-case EEikScrollThumbReleaseVert:
-{
 UpdateScrollIndicatorL();
 }
 break;
 case EEikScrollLeft: // flow through
 case EEikScrollRight: // flow through
 case EEikScrollPageLeft: // flow through
 case EEikScrollPageRight: // flow through
 case EEikScrollThumbDragHoriz: // flow through
 case EEikScrollThumbReleaseHoriz: // flow through
-// do nothing
-break;
 default:
 // do nothing
 break;
 }
-// If we have moved down to the last page we check that the cursor is in
-// a place where it can be drawn.
-if ( iFirstVisibleRow ==
-iRows/iExtension->iMaxVisibleRows * iExtension->iMaxVisibleRows )
-{
-// the old cursor is set to a "safe" position where it at least can be.
-iOldCursorPos.iX = 0;
-iOldCursorPos.iY = 0;
-// if the last page has only one line which isn't filled complitely.
-if ( ( iConsArray->Count() % iMaxColumns - 1 < iCursorPos.iX ) &&
-( iRows % iExtension->iMaxVisibleRows ) == 1 )
-{
-iCursorPos.iX = iConsArray->Count()%iMaxColumns - 1;
-}
-// If the cursor is in a position where it would go unto a spot without
-// a icon when scrolled.
-if ( iCursorPos.iY + iFirstVisibleRow >= iRows )
-{
-if ( iConsArray->Count() % iMaxColumns > iCursorPos.iX )
-{
-iCursorPos.iY = iRows - 1 - iFirstVisibleRow;
-}
-else
-{
-iCursorPos.iY = iRows - 2 - iFirstVisibleRow;
-}
-}
-// If the cursor is actually on the last row, but is still in the
-// area where there is now icons. ( the rest of the last row )
-if ( ( iConsArray->Count() <= ( iFirstVisibleRow + iCursorPos.iY )
-* iMaxColumns + iCursorPos.iX ) &&
-( iCursorPos.iY + iFirstVisibleRow + 1 == iRows ) )
-{
-iCursorPos.iY--;
-}
-// if the corrections did not help and the cursor is in the area
-// where there is a valid row, but no icons anymore
-}
 // to avoid flicker we draw only if there really was something new to draw.
 if ( update )
 {
 if ( iExtension->iObserver )
 {

branch	RCL_3
changeset 26	0a9e01492035
parent 1	40cb640ef159