--- a/photosgallery/viewframework/views/zoomview/inc/glxzoomeventhandler.h	Tue Feb 02 10:12:14 2010 +0200
+++ b/photosgallery/viewframework/views/zoomview/inc/glxzoomeventhandler.h	Fri Feb 19 22:51:01 2010 +0200
@@ -113,18 +113,41 @@
     */
     void HandleDragEvent(const GestureHelper::MGestureEvent& aEvent );
     
+    /**
+    * Handle the Pinch events for panning
+    */
     void HandlePinchEventL(const GestureHelper::MGestureEvent& aEvent);
     
+    /**
+    * Handle the Double Tap events for panning
+    */
     void HandleDoubleTap(const GestureHelper::MGestureEvent& aEvent );
     
+    /**
+    * Handle the Single Tap events for panning
+    */
     void HandleSingleTap(const GestureHelper::MGestureEvent& aEvent );
     
+    /**
+    * Handle the Gesture Released events for panning
+    */
     void HandleGestureReleased(const GestureHelper::MGestureEvent& aEvent );
     
+    /**
+    * Remembers the previous events code. 
+    */
     void SetPreviousEventCode(const GestureHelper::TGestureCode code );
     
+    /**
+    * Handle a multitouch gesture released event.
+    */
     void HandleMultiTouchReleased();
     
+    /**
+    * Bring back zoom state to minimum. 
+    */
+    void ZoomToMinimumL();
+    
 private:
     /*
      * Constructor
@@ -142,20 +165,10 @@
     TBool HandlekeyEvents(const TAlfEvent &aEvent);
     
     /**
-    * Callback function for zoom 
-    */     
-    static TInt ZoomIntervalExpired(TAny* aPtr);
-    
-    /**
     * Callback function for pan
     */ 
     static TInt PanIntervalExpired(TAny* aPtr);
     
-    /**
-    * Start zoom in/out continously
-    */     
-    void DoZoom();
-    
     // Zoom by the next zoom increment.
     // aZoomMode is ignored if aExpectedZoomLevel has a positive value
     void Zoom(TInt aExpectedZoomLevel, TInt aRelativeZoomFactor, TZoomMode aZoomMode = EZoomIn, TPoint* aZoomFocus = NULL);
@@ -165,11 +178,6 @@
     void DoPan();
     
     /**
-    * Starts the timer for continous zooming
-    */     
-    void StartZoomTimer();
-    
-    /**
     * Starts the timer for continous Panning
     */ 
     void StartPanTimer();
@@ -193,13 +201,6 @@
     static TInt ZoomOutTimerL(TAny* aSelf);
     
     /**
-    * Handle zoom key pressed or released.
-    * @param aZoomIn    :ETrue for Zoom In key, EFalse for Zoom Out key
-    * @param aEventCode :Type of key event.
-    */
-    void HandleZoomKey(TZoomMode aZoomMode, const TEventCode aEventCode);
-    
-    /**
     * Handle the key events for panning
     * @param aPanDirection: Specifies the pan direction
     * @param aEvent       : Specifies the event values.
@@ -270,7 +271,7 @@
     TPoint              iStartDisplayPoint;             // The variable holds the starting pointer posistion to determine the Drag Distance
     TTime               iDoubleTap;                     // This Variable is used to determine the double tap,by using the difference of the time 
                                                         // between subsequent single Tap.
-    // [todo] do we need this variable to be at a class level
+    TInt                iInitialZoomRatio;
     TInt                iZoomRatio;
     TRect               iDoubleTapRect;                 // This varaible holds the rect for the Double Tap
     TBool               iDragOngoing;                   // Is a drag event ongoing