uifw/AvKon/aknphysics/src/aknphysicsconeobserver.cpp
branchRCL_3
changeset 19 aecbbf00d063
parent 10 3d340a0166ff
child 20 d48ab3b357f1
--- a/uifw/AvKon/aknphysics/src/aknphysicsconeobserver.cpp	Thu Aug 19 10:11:06 2010 +0300
+++ b/uifw/AvKon/aknphysics/src/aknphysicsconeobserver.cpp	Tue Aug 31 15:28:30 2010 +0300
@@ -289,7 +289,7 @@
                         {
                         if ( child->Rect().Contains( aEvent->iPosition ) )
                             {
-                            target = ETargetChildControl;
+                            target = ETargetOtherControl;
                             }
                         }
                     }
@@ -319,8 +319,7 @@
         }
 
     if ( aEvent->iType == TPointerEvent::EButton1Up && 
-         iPhysics->IsPanningDrawOmitted() && 
-         eventTarget == ETargetViewControl )
+         iPhysics->IsPanningDrawOmitted() )
         {
         // Ensure that the last panning position gets drawn if the last
         // view redraw was omitted due to too high CPU use.
@@ -347,9 +346,8 @@
     if ( ongoingAction == CAknPhysics::EAknPhysicsActionFlicking )
         {
         // Event not targeted to view - stop flick
-        if (aTargetControl && (eventTarget == ETargetOtherControl 
-                || (eventTarget == ETargetChildControl && aTargetControl
-                != iWindowControl)))
+        if ( ( eventTarget == ETargetOtherControl || 
+                eventTarget == ETargetChildControl ) && aTargetControl )
             {
             stopPhysics = ETrue;
             aTargetControl->IgnoreEventsUntilNextPointerUp();