Merge "Make radio buttons work with size negotiation, bug fixes." into 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..90a741a 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/base/dali-toolkit/internal/controls/buttons/button-impl.cpp
@@ -234,13 +234,10 @@ void Button::OnTap(Actor actor, TapGesture tap)
   // Do nothing.
 }
 
   // 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 )
 }
 
 void Button::SetProperty( BaseObject* object, Property::Index index, const Property::Value& value )