*/
// CLASS HEADER
-
#include "push-button-impl.h"
// EXTERNAL INCLUDES
-
#include <algorithm>
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/object/type-registry.h>
+#include <dali/public-api/scripting/scripting.h>
// INTERNAL INCLUDES
-
#include "push-button-default-painter-impl.h"
#include <dali-toolkit/public-api/controls/text-view/text-view.h>
GetPushButtonPainter( mPainter )->Toggled( handle );
// Emit signal.
- mToggledSignalV2.Emit( handle, mToggled );
+ mToggledSignal.Emit( handle, mToggled );
}
}
return mFadeOutButtonImage;
}
-Toolkit::PushButton::PressedSignalV2& PushButton::PressedSignal()
+Toolkit::PushButton::PressedSignalType& PushButton::PressedSignal()
{
- return mPressedSignalV2;
+ return mPressedSignal;
}
-Toolkit::PushButton::ReleasedSignalV2& PushButton::ReleasedSignal()
+Toolkit::PushButton::ReleasedSignalType& PushButton::ReleasedSignal()
{
- return mReleasedSignalV2;
+ return mReleasedSignal;
}
bool PushButton::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
}
//Emit signal.
- mPressedSignalV2.Emit( handle );
+ mPressedSignal.Emit( handle );
}
}
GetPushButtonPainter( mPainter )->Toggled( handle );
// Emit signal.
- mToggledSignalV2.Emit( handle, mToggled );
+ mToggledSignal.Emit( handle, mToggled );
}
else
{
}
//Emit signal.
- mReleasedSignalV2.Emit( handle );
- mClickedSignalV2.Emit( handle );
+ mReleasedSignal.Emit( handle );
+ mClickedSignal.Emit( handle );
}
}
}
}
//Emit signal.
- mReleasedSignalV2.Emit( handle );
+ mReleasedSignal.Emit( handle );
}
}
}
GetPushButtonPainter( mPainter )->Pressed( handle );
//Emit signal.
- consumed = mReleasedSignalV2.Emit( handle );
- consumed |= mClickedSignalV2.Emit( handle );
- consumed |= mPressedSignalV2.Emit( handle );
+ consumed = mReleasedSignal.Emit( handle );
+ consumed |= mClickedSignal.Emit( handle );
+ consumed |= mPressedSignal.Emit( handle );
}
return consumed;
void PushButton::OnActivated()
{
// When the button is activated, it performs the click action
- std::vector<Property::Value> attributes;
+ PropertyValueContainer attributes;
DoClickAction(attributes);
}
}
}
-bool PushButton::DoAction(BaseObject* object, const std::string& actionName, const std::vector<Property::Value>& attributes)
+bool PushButton::DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes)
{
bool ret = false;