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 } |
317 { |
317 { |
318 iDragObserver->RegisterEventPosition( aEvent ); |
318 iDragObserver->RegisterEventPosition( aEvent ); |
319 } |
319 } |
320 |
320 |
321 if ( aEvent->iType == TPointerEvent::EButton1Up && |
321 if ( aEvent->iType == TPointerEvent::EButton1Up && |
322 iPhysics->IsPanningDrawOmitted() ) |
322 iPhysics->IsPanningDrawOmitted() && |
|
323 eventTarget == ETargetViewControl ) |
323 { |
324 { |
324 // Ensure that the last panning position gets drawn if the last |
325 // Ensure that the last panning position gets drawn if the last |
325 // view redraw was omitted due to too high CPU use. |
326 // view redraw was omitted due to too high CPU use. |
326 iPhysics->DrawViewInCurrentPosition(); |
327 iPhysics->DrawViewInCurrentPosition(); |
327 } |
328 } |
344 |
345 |
345 // Check if flick should be stopped |
346 // Check if flick should be stopped |
346 if ( ongoingAction == CAknPhysics::EAknPhysicsActionFlicking ) |
347 if ( ongoingAction == CAknPhysics::EAknPhysicsActionFlicking ) |
347 { |
348 { |
348 // Event not targeted to view - stop flick |
349 // Event not targeted to view - stop flick |
349 if ( ( eventTarget == ETargetOtherControl || |
350 if (aTargetControl && (eventTarget == ETargetOtherControl |
350 eventTarget == ETargetChildControl ) && aTargetControl ) |
351 || (eventTarget == ETargetChildControl && aTargetControl |
|
352 != iWindowControl))) |
351 { |
353 { |
352 stopPhysics = ETrue; |
354 stopPhysics = ETrue; |
353 aTargetControl->IgnoreEventsUntilNextPointerUp(); |
355 aTargetControl->IgnoreEventsUntilNextPointerUp(); |
354 } |
356 } |
355 } |
357 } |