(HitTest) Check clipped actor if it is really touchable before using as hit-actor

[platform/core/uifw/dali-core.git] / dali / internal / event / events / hit-test-algorithm-impl.cpp

diff --git a/dali/internal/event/events/hit-test-algorithm-impl.cpp b/dali/internal/event/events/hit-test-algorithm-impl.cpp
index 25d6a42..d47f35d 100644 (file)
--- a/dali/internal/event/events/hit-test-algorithm-impl.cpp
+++ b/dali/internal/event/events/hit-test-algorithm-impl.cpp
@@ -301,6 +301,14 @@ HitActor HitTestWithinLayer( Actor& actor,
                                                  clippingBitPlaneMask,
                                                  rayTest ) );
 
+        // Make sure the set hit actor is actually hittable. This is usually required when we have some
+        // clipping as we need to hit-test all actors as we descend the tree regardless of whether they
+        // are hittable or not.
+        if(currentHit.actor && !hitCheck.IsActorHittable(currentHit.actor))
+        {
+          continue;
+        }
+
         bool updateChildHit = false;
         if( currentHit.distance >= 0.0f )
         {