[dali_1.0.17] Merge branch 'tizen'

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

diff --git a/base/dali-toolkit/internal/controls/buttons/button-impl.cpp b/base/dali-toolkit/internal/controls/buttons/button-impl.cpp
index a4f1f90..fc1373d 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/base/dali-toolkit/internal/controls/buttons/button-impl.cpp
@@ -16,9 +16,12 @@
  */
 
 // CLASS HEADER
-
 #include "button-impl.h"
 
+// EXTERNAL INCLUDES
+#include <dali/public-api/events/touch-event.h>
+#include <dali/public-api/object/type-registry.h>
+
 namespace
 {
 const char* const PROPERTY_DIMMED = "dimmed";
@@ -229,18 +232,15 @@ void Button::OnControlSizeSet(const Vector3& targetSize)
   }
 }
 
-void Button::OnTap(Actor actor, TapGesture tap)
+void Button::OnTap(Actor actor, const TapGesture& tap)
 {
   // Do nothing.
 }
 
-void Button::OnStageDisconnection()
+void Button::OnControlStageDisconnection()
 {
-  if( ButtonUp != mState )
-  {
-    OnTouchPointLeave(); // Notification for derived classes.
-    mState = ButtonUp;
-  }
+  OnButtonStageDisconnection(); // Notification for derived classes.
+  mState = ButtonUp;
 }
 
 void Button::SetProperty( BaseObject* object, Property::Index index, const Property::Value& value )