X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fbutton-impl.cpp;h=dc00a3cd1beccd00507f27dbdb3bda9fe21b97bd;hp=6df5fcffcce007bb09504d747c0806b87c57c007;hb=1f65236b9e18de03cd60c0698f13b4e8da287c97;hpb=e5ca10134c73ca0588f893adde82694ad907dd8d

diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp
index 6df5fcf..dc00a3c 100644
--- a/dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp
@@ -20,10 +20,10 @@
 
 // EXTERNAL INCLUDES
 #include <cstring> // for strcmp
-#include <dali/public-api/events/touch-event.h>
+#include <dali/public-api/events/touch-data.h>
 #include <dali/public-api/images/resource-image.h>
 #include <dali/public-api/object/type-registry.h>
-#include <dali/devel-api/object/type-registry-helper.h>
+#include <dali/public-api/object/type-registry-helper.h>
 #include <dali/devel-api/scripting/scripting.h>
 
 // INTERNAL INCLUDES
@@ -108,7 +108,7 @@ const unsigned int NEXT_AUTOREPEATING_DELAY( 0.05f );
 } // unnamed namespace
 
 Button::Button()
-: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ),
+: Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ),
   mAutoRepeatingTimer(),
   mUnselectedColor( Color::WHITE ), // The natural colors of the specified images will be used by default.
   mSelectedColor( Color::WHITE ),
@@ -722,32 +722,6 @@ std::string Button::GetSelectedImageFilename() const
   return std::string();
 }
 
-std::string Button::GetBackgroundImageFilename() const
-{
-  if( mBackgroundContent )
-  {
-    ResourceImage image = ResourceImage::DownCast( mBackgroundContent );
-    if( image )
-    {
-      return image.GetUrl();
-    }
-  }
-  return std::string();
-}
-
-std::string Button::GetSelectedBackgroundImageFilename() const
-{
-  if( mSelectedBackgroundContent )
-  {
-    ResourceImage image = ResourceImage::DownCast( mSelectedBackgroundContent );
-    if( image )
-    {
-      return image.GetUrl();
-    }
-  }
-  return std::string();
-}
-
 std::string Button::GetDisabledImageFilename() const
 {
   if( mDisabledContent )
@@ -761,32 +735,6 @@ std::string Button::GetDisabledImageFilename() const
   return std::string();
 }
 
-std::string Button::GetDisabledSelectedImageFilename() const
-{
-  if( mDisabledSelectedContent )
-  {
-    ResourceImage image = ResourceImage::DownCast( mDisabledSelectedContent );
-    if( image )
-    {
-      return image.GetUrl();
-    }
-  }
-  return std::string();
-}
-
-std::string Button::GetDisabledBackgroundImageFilename() const
-{
-  if( mDisabledBackgroundContent )
-  {
-    ResourceImage image = ResourceImage::DownCast( mDisabledBackgroundContent );
-    if( image )
-    {
-      return image.GetUrl();
-    }
-  }
-  return std::string();
-}
-
 bool Button::DoAction( BaseObject* object, const std::string& actionName, const Property::Map& attributes )
 {
   bool ret = false;
@@ -942,15 +890,62 @@ bool Button::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tr
   return connected;
 }
 
-bool Button::OnTouchEvent(const TouchEvent& event)
+void Button::OnInitialize()
+{
+  Actor self = Self();
+
+  mTapDetector = TapGestureDetector::New();
+  mTapDetector.Attach( self );
+  mTapDetector.DetectedSignal().Connect(this, &Button::OnTap);
+
+  self.SetKeyboardFocusable( true );
+
+  self.TouchSignal().Connect( this, &Button::OnTouch );
+}
+
+bool Button::OnAccessibilityActivated()
+{
+  return OnKeyboardEnter();
+}
+
+bool Button::OnKeyboardEnter()
+{
+  // When the enter key is pressed, or button is activated, the click action is performed.
+  Property::Map attributes;
+  bool ret = DoClickAction( attributes );
+
+  return ret;
+}
+
+void Button::OnStageDisconnection()
+{
+  if( ButtonDown == mState )
+  {
+    if( !mTogglableButton )
+    {
+      Released();
+
+      if( mAutoRepeating )
+      {
+        mAutoRepeatingTimer.Reset();
+      }
+    }
+  }
+
+  mState = ButtonUp;
+
+  Control::OnStageDisconnection();
+}
+
+bool Button::OnTouch( Actor actor, const TouchData& touch )
 {
   // Only events are processed when the button is not disabled and the touch event has only
   // one touch point.
-  if( ( !mDisabled ) && ( 1 == event.GetPointCount() ) )
+  if( ( !mDisabled ) && ( 1 == touch.GetPointCount() ) )
   {
-    switch( event.GetPoint(0).state )
+    switch( touch.GetState( 0 ) )
     {
-      case TouchPoint::Down:
+      case PointState::DOWN:
       {
         OnButtonDown(); // Notification for derived classes.
 
@@ -958,7 +953,7 @@ bool Button::OnTouchEvent(const TouchEvent& event)
         mState = ButtonDown;
         break;
       }
-      case TouchPoint::Up:
+      case PointState::UP:
       {
         OnButtonUp(); // Notification for derived classes.
 
@@ -966,7 +961,7 @@ bool Button::OnTouchEvent(const TouchEvent& event)
         mState = ButtonUp;
         break;
       }
-      case TouchPoint::Interrupted:
+      case PointState::INTERRUPTED:
       {
         OnTouchPointInterrupted(); // Notification for derived classes.
 
@@ -974,7 +969,7 @@ bool Button::OnTouchEvent(const TouchEvent& event)
         mState = ButtonUp;
         break;
       }
-      case TouchPoint::Leave:
+      case PointState::LEAVE:
       {
         OnTouchPointLeave(); // Notification for derived classes.
 
@@ -982,20 +977,15 @@ bool Button::OnTouchEvent(const TouchEvent& event)
         mState = ButtonUp;
         break;
       }
-      case TouchPoint::Motion:
-      case TouchPoint::Stationary: // FALLTHROUGH
+      case PointState::MOTION:
+      case PointState::STATIONARY: // FALLTHROUGH
       {
         // Nothing to do
         break;
       }
-      default:
-      {
-        DALI_ASSERT_ALWAYS( !"Point status unhandled." );
-        break;
-      }
     }
   }
-  else if( 1 < event.GetPointCount() )
+  else if( 1 < touch.GetPointCount() )
   {
     OnTouchPointLeave(); // Notification for derived classes.
 
@@ -1006,51 +996,6 @@ bool Button::OnTouchEvent(const TouchEvent& event)
   return false;
 }
 
-void Button::OnInitialize()
-{
-  Actor self = Self();
-
-  mTapDetector = TapGestureDetector::New();
-  mTapDetector.Attach( self );
-  mTapDetector.DetectedSignal().Connect(this, &Button::OnTap);
-
-  self.SetKeyboardFocusable( true );
-}
-
-bool Button::OnAccessibilityActivated()
-{
-  return OnKeyboardEnter();
-}
-
-bool Button::OnKeyboardEnter()
-{
-  // When the enter key is pressed, or button is activated, the click action is performed.
-  Property::Map attributes;
-  bool ret = DoClickAction( attributes );
-
-  return ret;
-}
-
-void Button::OnStageDisconnection()
-{
-  if( ButtonDown == mState )
-  {
-    if( !mTogglableButton )
-    {
-      Released();
-
-      if( mAutoRepeating )
-      {
-        mAutoRepeatingTimer.Reset();
-      }
-    }
-  }
-
-  mState = ButtonUp;
-
-  Control::OnStageDisconnection();
-}
-
 void Button::OnTap(Actor actor, const TapGesture& tap)
 {
   // Do nothing.