camerauis/cameraapp/generic/src/CamZoomPane.cpp
changeset 1 f5ec9446e5bf
parent 0 1ddebce53859
child 18 51dda465e618
--- a/camerauis/cameraapp/generic/src/CamZoomPane.cpp	Thu Jan 07 16:18:56 2010 +0200
+++ b/camerauis/cameraapp/generic/src/CamZoomPane.cpp	Mon Jan 18 20:06:55 2010 +0200
@@ -1009,6 +1009,7 @@
         
     // Only allow drag if the zoom is already active
     if ( type == TPointerEvent::EDrag &&
+            tchZoomArea.Contains( aPointerEvent.iPosition ) &&
          iTouchActive )
         { 
         TBool ret = StartTouchZoomL( aPointerEvent.iPosition.iY );
@@ -1017,7 +1018,9 @@
         }  
     
     // Clean up when the touch events are stopped
-    if ( type == TPointerEvent::EButton1Up )
+    if ( type == TPointerEvent::EButton1Up ||
+            (type == TPointerEvent::EDrag &&
+                    !tchZoomArea.Contains( aPointerEvent.iPosition )))
         {
         // don't do anything for stray touches
         if ( iTouchActive )