diff -r f9e827349359 -r b023a8d2866a photosgallery/viewframework/views/zoomview/inc/glxzoomeventhandler.h --- a/photosgallery/viewframework/views/zoomview/inc/glxzoomeventhandler.h Mon Jun 21 15:40:32 2010 +0300 +++ b/photosgallery/viewframework/views/zoomview/inc/glxzoomeventhandler.h Thu Jul 15 18:39:01 2010 +0300 @@ -72,12 +72,11 @@ /* * ActivateZoom from the Zoom control */ - void ActivateZoom(TInt initialZoomRatio, + void ActivateZoom( TInt aInitialZoomRatio, TSize imageSize, TZoomStartMode aStartMode, - TInt aMinSliderRange, - TInt aMaxSliderRange, - TSize& aOriginalDimensions, + TInt aMinZoomRatio, + TInt aMaxZoomRatio, TPoint* aZoomFocus); /* @@ -271,13 +270,12 @@ 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. - TInt iInitialZoomRatio; TInt iZoomRatio; TRect iDoubleTapRect; // This varaible holds the rect for the Double Tap TBool iDragOngoing; // Is a drag event ongoing TBool iZoomActivated; // To Denote if zoom is activated TUiState iZoomUiState; // To Denote if the Ui is On in zoom - TInt iPrevPinchFactor; // To avoid the bouce while pinch gesture end + TInt iPrevPinchPercentage; // To avoid the bouce while pinch gesture end TPoint iPreviousPointerPosition; TPoint iPreviousDragStartPosition;