--- a/photosgallery/viewframework/views/zoomview/src/glxzoomcontrol.cpp Wed Apr 14 15:57:24 2010 +0300
+++ b/photosgallery/viewframework/views/zoomview/src/glxzoomcontrol.cpp Tue Apr 27 16:37:53 2010 +0300
@@ -272,7 +272,7 @@
// ActivateL:Activates the Zoom Control,set the image visual ,do the initial setup
// -----------------------------------------------------------------------------
//
-EXPORT_C void CGlxZoomControl::ActivateL(TInt /*aInitialZoomRatio*/, TZoomStartMode aStartMode,
+EXPORT_C void CGlxZoomControl::ActivateL(TInt aInitialZoomRatio, TZoomStartMode aStartMode,
TInt aFocusIndex, TGlxMedia& aItem, TPoint* aZoomFocus,TBool aViewingMode)
{
TRACER("CGlxZoomControl::ActivateL()");
@@ -320,16 +320,28 @@
// Maximum is an
TInt initialZoomRatio = GetInitialZoomLevel(maxVirtualImageSize);
iZoomSliderModel->SetMinRange(initialZoomRatio);
-
+
iEventHandler->SetZoomActivated(ETrue);
- iEventHandler->ActivateZoom(initialZoomRatio,
- maxVirtualImageSize,
- aStartMode,
- iZoomSliderModel->MinRange(),
- iZoomSliderModel->MaxRange(),
- maxVirtualImageSize,
- aZoomFocus);
-
+ if (aStartMode == EZoomStartSlider)
+ {
+ iEventHandler->ActivateZoom(aInitialZoomRatio,
+ maxVirtualImageSize,
+ aStartMode,
+ iZoomSliderModel->MinRange(),
+ iZoomSliderModel->MaxRange(),
+ maxVirtualImageSize,
+ aZoomFocus);
+ }
+ else
+ {
+ iEventHandler->ActivateZoom(initialZoomRatio,
+ maxVirtualImageSize,
+ aStartMode,
+ iZoomSliderModel->MinRange(),
+ iZoomSliderModel->MaxRange(),
+ maxVirtualImageSize,
+ aZoomFocus);
+ }
TRAP_IGNORE(iImageTexture =
&(iTextureMgr->CreateZoomedTextureL(aItem,thumbNailAttribute,idspace,this)));
@@ -882,11 +894,8 @@
iEventHandler->HandleDragEvent(aEvent);
}
break;
- case EGestureTap:
- if (aEvent.Visual() == iImageVisual)
- {
+ case EGestureTap:
iEventHandler->HandleSingleTap(aEvent);
- }
break;
case EGesturePinch:
iEventHandler->HandlePinchEventL(aEvent);