equal
deleted
inserted
replaced
287 CCoeControl* child = iViewControl->ComponentControl( i ); |
287 CCoeControl* child = iViewControl->ComponentControl( i ); |
288 if ( child && child->IsVisible() && !child->OwnsWindow() ) |
288 if ( child && child->IsVisible() && !child->OwnsWindow() ) |
289 { |
289 { |
290 if ( child->Rect().Contains( aEvent->iPosition ) ) |
290 if ( child->Rect().Contains( aEvent->iPosition ) ) |
291 { |
291 { |
292 target = ETargetOtherControl; |
292 target = ETargetChildControl; |
293 } |
293 } |
294 } |
294 } |
295 } |
295 } |
296 } |
296 } |
297 } |
297 } |
344 |
344 |
345 // Check if flick should be stopped |
345 // Check if flick should be stopped |
346 if ( ongoingAction == CAknPhysics::EAknPhysicsActionFlicking ) |
346 if ( ongoingAction == CAknPhysics::EAknPhysicsActionFlicking ) |
347 { |
347 { |
348 // Event not targeted to view - stop flick |
348 // Event not targeted to view - stop flick |
349 if ( ( eventTarget == ETargetOtherControl || |
349 if (aTargetControl && (eventTarget == ETargetOtherControl |
350 eventTarget == ETargetChildControl ) && aTargetControl ) |
350 || (eventTarget == ETargetChildControl && aTargetControl |
|
351 != iWindowControl))) |
351 { |
352 { |
352 stopPhysics = ETrue; |
353 stopPhysics = ETrue; |
353 aTargetControl->IgnoreEventsUntilNextPointerUp(); |
354 aTargetControl->IgnoreEventsUntilNextPointerUp(); |
354 } |
355 } |
355 } |
356 } |