Fix MapView touch issue

Change-Id: I8c5b2b82b260953a6c3107930ea10fbbbca0389a
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>

diff --git a/automated-tests/src/dali/utc-Dali-HitTestAlgorithm.cpp b/automated-tests/src/dali/utc-Dali-HitTestAlgorithm.cpp
index 20279f7..4d102c1 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-HitTestAlgorithm.cpp
+++ b/automated-tests/src/dali/utc-Dali-HitTestAlgorithm.cpp
@@ -625,7 +625,7 @@ int UtcDaliHitTestAlgorithmOrder(void)
 
   HitTestAlgorithm::Results results;
   HitTest(stage, stageSize / 2.0f, results, &DefaultIsActorTouchableFunction);
-  DALI_TEST_CHECK(results.actor == green);
+  DALI_TEST_CHECK(results.actor == blue);
 
   END_TEST;
 }

diff --git a/dali/internal/event/events/hit-test-algorithm-impl.cpp b/dali/internal/event/events/hit-test-algorithm-impl.cpp
index 2efaa51..784b40f 100644 (file)
--- a/dali/internal/event/events/hit-test-algorithm-impl.cpp
+++ b/dali/internal/event/events/hit-test-algorithm-impl.cpp
@@ -144,17 +144,25 @@ bool IsActorExclusiveToAnotherRenderTask(const Actor&
                                          const RenderTaskList::ExclusivesContainer& exclusives)
 
 {
+  bool exclusiveByOtherTask = false;
   if(exclusives.size())
   {
     for(const auto& exclusive : exclusives)
     {
-      if((exclusive.renderTaskPtr != &renderTask) && (exclusive.actor.GetActor() == &actor))
+      if(exclusive.actor.GetActor() == &actor)
       {
-        return true;
+        if(exclusive.renderTaskPtr != &renderTask)
+        {
+          exclusiveByOtherTask = true;
+        }
+        else
+        {
+          return true;
+        }
       }
     }
   }
-  return false;
+  return exclusiveByOtherTask;
 }
 
 /**