--- a/photosgallery/viewframework/views/zoomview/src/glxzoomeventhandler.cpp Tue May 11 16:13:40 2010 +0300
+++ b/photosgallery/viewframework/views/zoomview/src/glxzoomeventhandler.cpp Tue May 25 12:42:31 2010 +0300
@@ -253,7 +253,6 @@
//After Panning in one direction for a long time by holding the key and
//then if panning is started in another direction,the panning will be done in more pixels.
- iPanTime.HomeTime();
GLX_LOG_INFO("CGlxZoomPanEventHandler::StartPanTimer: Cancelling timers ");
@@ -830,7 +829,7 @@
CancelZoomPanTimer();
}
- iMathsEngine.UpdatePanFactor(iPanTime);
+ iMathsEngine.UpdatePanFactor();
}
@@ -842,8 +841,8 @@
{
TRACER("CGlxZoomPanEventHandler::OrientationChanged ");
- iMathsEngine.OrientationChanged(aNewScreenRect); // Needs to be called before Call to Zoom() inorder to Update the iScreenSize.
-
+ iMathsEngine.OrientationChanged(aNewScreenRect);
+ iMinZoomRatio = iMathsEngine.MinimumZoomRatio();
Zoom(0, 0, iZoomMode) ;
}
@@ -1123,18 +1122,18 @@
&atZoomThreshold,
aZoomFocus,
aRelativeZoomFactor);
-
- iZoomEventHandler.HandleViewPortParametersChanged(viewPortTopLeft, 0,
- &viewPortDimension, iZoomRatio);
-
+
if( atZoomThreshold )
{
CancelZoomPanTimer();
if (iZoomRatio <= iMinZoomRatio)
{
CallZoomOutL();
+ return;
}
}
+ iZoomEventHandler.HandleViewPortParametersChanged(viewPortTopLeft, 0,
+ &viewPortDimension, iZoomRatio);
}
// -----------------------------------------------------------------------------