MCL/sf/app/homescreen: comparison taskswitcher/taskswitcherui/taskswitcherapp/src/tsfastswapgrid.cpp

equal deleted inserted replaced

-:9674c1a575e9
+:b8fae6b8a148
 * CTsFastSwapGrid
 * ================================================================================
 */
 const TInt KCloseIconRedrawTime = 300000; // 0.3 second
-const TInt KFeedbackTime = 0;
+const TInt KStrokeThickness = 1;
 // -----------------------------------------------------------------------------
 // CTsFastSwapGrid::CTsFastSwapGrid
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 //
 CTsFastSwapGrid::~CTsFastSwapGrid()
 {
 iCloseItems.Close();
-delete iBgContext;
 delete iCloseIconRedrawTimer;
-delete iFeedbackTimer;
-iFullyVisibleItems.Close();
-iPartialVisibleItems.Close();
 }
 // -----------------------------------------------------------------------------
 // CTsFastSwapGrid::ConstructL
 // -----------------------------------------------------------------------------
 iParent = aParent;
 CAknGrid::ConstructL( aParent, EAknListBoxSelectionGrid );
 SetPrimaryScrollingType(CAknGridView::EScrollFollowsItemsAndLoops);
 SetSecondaryScrollingType(CAknGridView::EScrollFollowsItemsAndLoops);
-iBgContext = CAknsFrameBackgroundControlContext::NewL(
-KAknsIIDQsnFrPopup,
-TRect(),
-TRect(),
-ETrue );
-iBgContext->SetCenter( KAknsIIDQsnFrPopupCenter );
 iCloseIconRedrawTimer = new (ELeave) CTsFastSwapTimer( *this );
 iCloseIconRedrawTimer->ConstructL();
-iFeedbackTimer = new (ELeave) CTsFastSwapTimer( *this );
-iFeedbackTimer->ConstructL();
 TSLOG_OUT();
 }
 // -----------------------------------------------------------------------------
 TSLOG_CONTEXT( CTsFastSwapGrid::HandleDeviceStateChanged, TSLOG_LOCAL );
 TSLOG_IN();
 if ( aChangeType == ESkin )
 {
-LoadCloseIcon();
+LoadCloseIconAndStrokeParams();
 }
 TSLOG_OUT();
-}
-// -----------------------------------------------------------------------------
-// CTsFastSwapGrid::MopSupplyObject
-// -----------------------------------------------------------------------------
-//
-TTypeUid::Ptr CTsFastSwapGrid::MopSupplyObject( TTypeUid aId )
-{
-if ( aId.iUid == MAknsControlContext::ETypeId )
-{
-return MAknsControlContext::SupplyMopObject( aId, iBgContext );
-}
-return CCoeControl::MopSupplyObject( aId );
 }
 // -----------------------------------------------------------------------------
 // CTsFastSwapGrid::HandleResourceChange
 // CTsFastSwapGrid::SizeChanged
 // -----------------------------------------------------------------------------
 //
 void CTsFastSwapGrid::SizeChanged()
 {
+}
+// -----------------------------------------------------------------------------
+// CTsFastSwapGrid::Draw
+// -----------------------------------------------------------------------------
+//
+void CTsFastSwapGrid::Draw( const TRect& aRect ) const
+{
+CAknGrid::Draw(aRect);
+if ( !Model()->ItemTextArray()->MdcaCount() )
+{
+GridView()->DrawEmptyList();
+}
 }
 // -----------------------------------------------------------------------------
 // CTsFastSwapGrid::SetFastSwapGridObserver
 CleanupStack::PushL( itemDrawer );
 itemDrawer->SetEdgeOffset( leftOffset, rightOffset );
 iItemDrawer = itemDrawer;
 CleanupStack::Pop( itemDrawer );
 CleanupStack::Pop( data );
-LoadCloseIcon();
+LoadCloseIconAndStrokeParams();
 TSLOG_OUT();
 }
 // -----------------------------------------------------------------------------
 {
 TInt itemToClose = iCloseIconHitIdx;
 ResetCloseHit();
 iFastSwapGridObserver->HandleCloseEventL( itemToClose );
 }
-else if ( aSource == iFeedbackTimer )
-{
-MTouchFeedback* feedback = MTouchFeedback::Instance();
-if (feedback)
-{
-feedback->InstantFeedback(ETouchFeedbackSensitive);
-}
-}
 }
 // -----------------------------------------------------------------------------
 // CTsFastSwapGrid::SetCloseItemsL
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 //
 void CTsFastSwapGrid::ResetCloseHit()
 {
 iCloseIconHitIdx = KErrNotFound;
+}
+// -----------------------------------------------------------------------------
+// CTsFastSwapGrid::SetStrokeColor
+// -----------------------------------------------------------------------------
+//
+void CTsFastSwapGrid::SetStrokeColors( TRgb aColor,
+TRgb aHighlightedColor )
+{
+static_cast<CTsGridItemDrawer*>(iItemDrawer)->SetStrokeColors(aColor, aHighlightedColor);
+}
+// -----------------------------------------------------------------------------
+// CTsFastSwapGrid::SetStrokeItemsL
+// -----------------------------------------------------------------------------
+//
+void CTsFastSwapGrid::SetStrokeItemsL( RArray<TInt>& aItemIndex )
+{
+static_cast<CTsGridItemDrawer*>(iItemDrawer)->SetStrokeItemsL(aItemIndex);
 }
 // -----------------------------------------------------------------------------
 // CTsFastSwapGrid::SetBehaviour
 return retVal;
 }
 // -----------------------------------------------------------------------------
-// CTsFastSwapGrid::LoadCloseIconL
+// CTsFastSwapGrid::LoadCloseIconAndStrokeParams
 // -----------------------------------------------------------------------------
 //
-void CTsFastSwapGrid::LoadCloseIcon()
+void CTsFastSwapGrid::LoadCloseIconAndStrokeParams()
 {
 // Load and set close icon
 CFbsBitmap* icon = NULL;
-CFbsBitmap* mask = NULL;
+CFbsBitmap* iconMask = NULL;
+CFbsBitmap* iconPressed = NULL;
-TRAP_IGNORE(AknsUtils::CreateColorIconLC( AknsUtils::SkinInstance(),
+CFbsBitmap* iconPressedMask = NULL;
-KAknsIIDQgnIndiItutListCollapse,
-KAknsIIDQsnTextColors,    // we use text color here, eventhough this is an icon
+TRAP_IGNORE(AknsUtils::CreateIconL( AknsUtils::SkinInstance(),
-EAknsCIQsnTextColorsCG13, // softkey text color
+KAknsIIDQgnIndiTsButtonClose,
 icon,
-mask,
+iconMask,
 KAvkonBitmapFile,
 EMbmAvkonQgn_indi_button_preview_close,
-EMbmAvkonQgn_indi_button_preview_close_mask,
+EMbmAvkonQgn_indi_button_preview_close_mask
-KRgbWhite
+));
-);
-CleanupStack::Pop( 2 ); // codescanner::cleanup
+TRAP_IGNORE(AknsUtils::CreateIconL( AknsUtils::SkinInstance(),
-);
+KAknsIIDQgnIndiTsButtonClosePressed,
+iconPressed,
+iconPressedMask,
+KAvkonBitmapFile,
+EMbmAvkonQgn_indi_button_preview_close,
+EMbmAvkonQgn_indi_button_preview_close_mask
+));
 TAknLayoutRect gridAppPane;
 TAknLayoutRect gridItem;
+TAknLayoutRect gridImage;
 TAknLayoutRect gridCloseButton;
 TAknLayoutRect gridCloseIcon;
 TInt variety = Layout_Meta_Data::IsLandscapeOrientation() ? 1 : 0;
 TRect source = iParent ? iParent->Rect() : Rect();
 gridAppPane.LayoutRect( source,
 AknLayoutScalable_Apps::tport_appsw_pane( variety ) );
 gridItem.LayoutRect( gridAppPane.Rect(),
 AknLayoutScalable_Apps::cell_tport_appsw_pane( variety, 0, 0 ) );
+gridImage.LayoutRect( gridItem.Rect(),
+AknLayoutScalable_Apps::cell_tport_appsw_pane_g1( variety ) );
 gridCloseButton.LayoutRect( gridItem.Rect(),
 AknLayoutScalable_Apps::bg_button_pane_cp16( variety, 0, 0 ));
 gridCloseIcon.LayoutRect( gridItem.Rect(),
 AknLayoutScalable_Apps::cell_tport_appsw_pane_g3( variety, 0, 0 ));
+// Set icon size
 AknIconUtils::SetSize( icon, gridCloseIcon.Rect().Size(), EAspectRatioPreserved );
-AknIconUtils::SetSize( mask, gridCloseIcon.Rect().Size(), EAspectRatioPreserved );
+AknIconUtils::SetSize( iconPressed, gridCloseIcon.Rect().Size(), EAspectRatioPreserved );
 CTsGridItemDrawer* itemDrawer =
 static_cast<CTsGridItemDrawer*>(iItemDrawer);
-itemDrawer->SetCloseIcon( icon, mask );
+// Setup close parameters
+itemDrawer->SetCloseIcon( icon, iconMask, iconPressed, iconPressedMask );
 TRect relGridCloseButton = TRect( TPoint( gridCloseButton.Rect().iTl.iX - gridItem.Rect().iTl.iX,
 gridCloseButton.Rect().iTl.iY - gridItem.Rect().iTl.iY),
 gridCloseButton.Rect().Size() );
 TRect relGridCloseIconRect = TRect( TPoint( gridCloseIcon.Rect().iTl.iX - gridItem.Rect().iTl.iX,
 gridCloseIcon.Rect().iTl.iY - gridItem.Rect().iTl.iY),
 gridCloseIcon.Rect().Size() );
 itemDrawer->SetCloseIconRect( relGridCloseButton, relGridCloseIconRect );
+// Setup stroke parameters
+TPoint strokeOffset;
+strokeOffset.iX = gridImage.Rect().iTl.iX - gridItem.Rect().iTl.iX - KStrokeThickness;
+strokeOffset.iY = gridImage.Rect().iTl.iY - gridItem.Rect().iTl.iY - KStrokeThickness;
+TSize strokeSize = gridImage.Rect().Size();
+strokeSize.iHeight += KStrokeThickness * 2;
+strokeSize.iWidth += KStrokeThickness * 2;
+itemDrawer->SetStrokeOffset( strokeOffset, strokeSize );
 }
 // -----------------------------------------------------------------------------
 // CTsFastSwapGrid::Redraw
 ctrlToRedraw->DrawNow();
 }
 }
 }
-// -----------------------------------------------------------------------------
-// CTsFastSwapGrid::LaunchTactileFeedback
-// -----------------------------------------------------------------------------
-//
-void CTsFastSwapGrid::LaunchTactileFeedback()
-{
-if( !iTactileFeedbackSupport )
-{
-return;
-}
-iFeedbackTimer->Cancel();
-iFeedbackTimer->After(KFeedbackTime);
-}
-// -----------------------------------------------------------------------------
-// CTsFastSwapGrid::SetTactileFeedbackSupport
-// -----------------------------------------------------------------------------
-//
-void CTsFastSwapGrid::SetTactileFeedbackSupport(TBool aSupport)
-{
-iTactileFeedbackSupport = aSupport;
-}
-// -----------------------------------------------------------------------------
-// CTsFastSwapGrid::RemoveFromVisibleItems
-// -----------------------------------------------------------------------------
-//
-TBool CTsFastSwapGrid::RemoveFromVisibleItems(TInt aItem) const
-{
-TBool retVal(EFalse);
-TInt idx(0);
-idx = iFullyVisibleItems.Find(aItem);
-if(  idx >= 0)
-{
-iFullyVisibleItems.Remove(idx);
-retVal = ETrue;
-}
-idx = iPartialVisibleItems.Find( aItem );
-if( idx >= 0)
-{
-iPartialVisibleItems.Remove(idx);
-retVal = ETrue;
-}
-return retVal;
-}
-// -----------------------------------------------------------------------------
-// CTsFastSwapGrid::AddToFullyVisibleItems
-// -----------------------------------------------------------------------------
-//
-TBool CTsFastSwapGrid::AddToFullyVisibleItems( TInt aItem ) const
-{
-TBool retVal(EFalse);
-TInt idx(0);
-idx = iPartialVisibleItems.Find(aItem);
-if(  idx >= 0)
-{
-iPartialVisibleItems.Remove(idx);
-}
-idx = iFullyVisibleItems.Find( aItem );
-if( idx == KErrNotFound )
-{
-iFullyVisibleItems.Append(aItem);
-retVal = ETrue;
-}
-return retVal;
-}
-// -----------------------------------------------------------------------------
-// CTsFastSwapGrid::MoveToPartialVisibleItems
-// -----------------------------------------------------------------------------
-//
-TBool CTsFastSwapGrid::MoveToPartialVisibleItems( TInt aItem ) const
-{
-TInt idx(0);
-idx = iFullyVisibleItems.Find(aItem);
-if(  idx >= 0)
-{
-iFullyVisibleItems.Remove(idx);
-}
-idx = iPartialVisibleItems.Find( aItem );
-if( idx == KErrNotFound )
-{
-iPartialVisibleItems.Append(aItem);
-}
-return EFalse;
-}
 /* ================================================================================
 * CTsGridItemDrawer
 * ================================================================================
 */
 TRect aScreenRect )
 : CFormattedCellListBoxItemDrawer( aGrid->Model(),
 NULL,
 aData ),
 iGrid( aGrid ),
-iScreenRect(aScreenRect)
+iScreenRect( aScreenRect ),
+iStrokeColor( KRgbBlack ),
+iHighlightStrokeColor( KRgbBlack )
 {
 }
 // -----------------------------------------------------------------------------
 //
 CTsGridItemDrawer::~CTsGridItemDrawer()
 {
 delete iCloseIcon;
 delete iCloseIconMask;
+delete iCloseIconPressed;
+delete iCloseIconPressedMask;
+iStrokeItems.Close();
 }
 // -----------------------------------------------------------------------------
 // CTsGridItemDrawer::SetCloseIcon
 // -----------------------------------------------------------------------------
 //
-void CTsGridItemDrawer::SetCloseIcon( CFbsBitmap* aBmp, CFbsBitmap* aMask )
+void CTsGridItemDrawer::SetCloseIcon( CFbsBitmap* aBmp, CFbsBitmap* aBmpMask,
+CFbsBitmap* aBmpPressed, CFbsBitmap* aBmpPressedMask  )
 {
 delete iCloseIcon;
 iCloseIcon = aBmp;
 delete iCloseIconMask;
-iCloseIconMask = aMask;
+iCloseIconMask = aBmpMask;
+delete iCloseIconPressed;
+iCloseIconPressed = aBmpPressed;
+delete iCloseIconPressedMask;
+iCloseIconPressedMask = aBmpPressedMask;
 }
 // -----------------------------------------------------------------------------
 // CTsGridItemDrawer::SetCloseIconRect
 iRedrawBackground = aEnable;
 }
 // -----------------------------------------------------------------------------
+// CTsGridItemDrawer::SetStrokeColor
+// -----------------------------------------------------------------------------
+//
+void CTsGridItemDrawer::SetStrokeColors( TRgb aColor,
+TRgb aHighlightedColor )
+{
+iStrokeColor = aColor;
+iHighlightStrokeColor = aHighlightedColor;
+}
+// -----------------------------------------------------------------------------
+// CTsGridItemDrawer::SetStrokeItemsL
+// -----------------------------------------------------------------------------
+//
+void CTsGridItemDrawer::SetStrokeItemsL( RArray<TInt>& aItemIndex )
+{
+iStrokeItems.Close();
+for ( TInt i = 0; i < aItemIndex.Count(); i++ )
+{
+iStrokeItems.AppendL( aItemIndex[i] );
+}
+}
+// -----------------------------------------------------------------------------
+// CTsGridItemDrawer::SetStrokeOffset
+// -----------------------------------------------------------------------------
+//
+void CTsGridItemDrawer::SetStrokeOffset( TPoint aStrokeOffset, TSize aStrokeSize )
+{
+iStrokeRect = TRect( aStrokeOffset, aStrokeSize );
+}
+// -----------------------------------------------------------------------------
 // CTsGridItemDrawer::DrawActualItem
 // -----------------------------------------------------------------------------
 //
 void CTsGridItemDrawer::DrawActualItem( TInt aItemIndex, const TRect& aActualItemRect,
 TBool aItemIsCurrent, TBool aViewIsEmphasized,
 TBool aViewIsDimmed, TBool aItemIsSelected ) const
 {
-TBool feedbackNeed(EFalse);//feedback when item disappear or fully appear
 if (IsItemRectVisible(aActualItemRect))
 {
 // Calculate offset of the visible rectangle
 TRect drawRect = aActualItemRect;
 if ( drawRect.iTl.iX < iLeftOffset )
 if ( iScreenRect.Width() - drawRect.iBr.iX < iRightOffset )
 {
 drawRect.iBr.iX = iScreenRect.Width() - iRightOffset;
 }
 iGc->SetClippingRect(drawRect);
-		if(IsRectContained( aActualItemRect, drawRect ))
-{
-feedbackNeed = iGrid->AddToFullyVisibleItems( aItemIndex );
-}
-else
-{
-feedbackNeed = iGrid->MoveToPartialVisibleItems( aItemIndex );
-}
 // Check for item highlight
 TBool itemIsCurrent = !iGrid->IsHighlightVisible() ? EFalse : aItemIsCurrent;
 // Draw background if necessary
 // Draw item
 CFormattedCellListBoxItemDrawer::DrawActualItem(aItemIndex, aActualItemRect,
 itemIsCurrent, aViewIsEmphasized, aViewIsDimmed, aItemIsSelected );
-if ( iGrid->CanCloseItem( aItemIndex ) && iCloseIcon && iCloseIconMask )
+// Draw stroke
+if ( iStrokeItems.Find( aItemIndex ) != KErrNotFound )
+{
+TRect strokeRect = iStrokeRect;
+strokeRect.Move( aActualItemRect.iTl );
+if ( itemIsCurrent )
+{
+iGc->SetPenColor( iHighlightStrokeColor );
+}
+else
+{
+iGc->SetPenColor( iStrokeColor );
+}
+// Thumbnail stroke
+iGc->DrawRect( strokeRect );
+}
+// Draw close button
+if ( iGrid->CanCloseItem( aItemIndex ) && iCloseIcon && iCloseIconPressed )
 {
 TRect closeIconRect = GetCloseButtonRect( aActualItemRect );
 // Draw frame
 TRect outerRect = closeIconRect;
 TRect innerRect = CalculateInnerButtonRect( outerRect );
 MAknsSkinInstance* skin = AknsUtils::SkinInstance();
 if ( iGrid->IsItemCloseHit( aItemIndex ) )
 {
-AknsDrawUtils::DrawFrame(skin, *iGc, outerRect, innerRect,
+TRect sourceRect( TPoint(0,0), iCloseIconPressed->SizeInPixels() );
-KAknsIIDQgnFrSctrlButtonPressed, KAknsIIDQgnFrSctrlButtonCenterPressed);
+iGc->DrawBitmapMasked( innerRect,
+iCloseIconPressed,
+sourceRect,
+iCloseIconPressedMask,
+ETrue );
 }
 else
 {
-AknsDrawUtils::DrawFrame(skin, *iGc, outerRect, innerRect,
+TRect sourceRect( TPoint(0,0), iCloseIcon->SizeInPixels() );
-KAknsIIDQgnFrSctrlButton, KAknsIIDQgnFrSctrlButtonCenter);
+iGc->DrawBitmapMasked( innerRect,
+iCloseIcon,
+sourceRect,
+iCloseIconMask,
+ETrue );
 }
-// Draw close icon
+}
-TRect sourceRect( TPoint(0,0), iCloseIcon->SizeInPixels() );
-iGc->DrawBitmapMasked( innerRect, iCloseIcon, sourceRect, iCloseIconMask, ETrue );
-}
-}
-else
-{
-feedbackNeed = iGrid->RemoveFromVisibleItems(aItemIndex);
-}
-if(feedbackNeed)
-{
-iGrid->LaunchTactileFeedback();
 }
 }
 // -----------------------------------------------------------------------------
 // CTsGridItemDrawer::DrawActualItem

branch	RCL_3
changeset 17	b8fae6b8a148
parent 12	9674c1a575e9
child 18	d05a55b217df