--- a/taskswitcher/taskswitcherui/taskswitcherapp/src/tsfastswapgrid.cpp	Wed Sep 15 12:00:00 2010 +0300
+++ b/taskswitcher/taskswitcherui/taskswitcherapp/src/tsfastswapgrid.cpp	Wed Oct 13 14:18:30 2010 +0300
@@ -515,14 +515,16 @@
                 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 = Rect();
-    gridItem.LayoutRect( source,
+    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 ) ); 
@@ -863,5 +865,53 @@
     retVal.iBr.iY -= iCloseButtonRect.iBr.iY - iCloseIconRect.iBr.iY;
     return retVal;
     }
-  
+ 
+ 
+ 
+ /* ================================================================================
+  * CTsGridHighlightTimer
+  * ================================================================================
+  */
+
+// -----------------------------------------------------------------------------
+// CTsGridHighlightTimer::CTsGridHighlightTimer
+// -----------------------------------------------------------------------------
+//
+CTsFastSwapTimer::CTsFastSwapTimer( MTsFastSwapTimerObserver& aObserver )
+: CTimer( EPriorityStandard ),
+  iObserver( &aObserver )
+    {
+    }
+
+
+// -----------------------------------------------------------------------------
+// CTsGridHighlightTimer::CTsGridHighlightTimer
+// -----------------------------------------------------------------------------
+//
+CTsFastSwapTimer::~CTsFastSwapTimer()
+    {
+    Cancel();
+    }
+
+
+// -----------------------------------------------------------------------------
+// CTsGridHighlightTimer::ConstructL
+// -----------------------------------------------------------------------------
+//
+void CTsFastSwapTimer::ConstructL()
+    {
+    CTimer::ConstructL();
+    CActiveScheduler::Add( this );
+    }
+
+
+// -----------------------------------------------------------------------------
+// CTsGridHighlightTimer::CTsGridHighlightTimer
+// -----------------------------------------------------------------------------
+//
+void CTsFastSwapTimer::RunL()
+    {
+    iObserver->TimerCompletedL(this);
+    }
+ 
  // End of file