[Tizen] Revert "Changes after touch consumed behaviour change"

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / buttons / button-impl.cpp

diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp
index d840e96..f102a19 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp
@@ -630,7 +630,11 @@ bool Button::OnAccessibilityActivated()
 
 bool Button::OnTouch( Actor actor, const TouchEvent& touch )
 {
-  if( !IsDisabled() && (actor == touch.GetHitActor(0)) )
+
+  // Only events are processed when the button is not disabled
+  auto result( false );
+
+  if( !IsDisabled() )
   {
     if ( 1 == touch.GetPointCount() )
     {
@@ -671,8 +675,9 @@ bool Button::OnTouch( Actor actor, const TouchEvent& touch )
       // Sets the button state to the default
       mButtonPressedState = UNPRESSED;
     }
+    result = true;
   }
-  return false;
+  return result;
 }
 
 bool Button::OnKeyboardEnter()