X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fscrollable-impl.cpp;h=28e2e435c406d1c833331179ca1974fac732d26a;hp=64fa2b9be6ec4d7b1fe0ca547dcbb886141cce4e;hb=f546dd5d83a968e573f8f053a01ce43df32c71a0;hpb=dc3613bb6248908c267a76e378b04962bce85664 diff --git a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp index 64fa2b9..28e2e43 100644 --- a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp @@ -16,42 +16,27 @@ */ // EXTERNAL INCLUDES +#include // for strcmp #include +#include // INTERNAL INCLUDES #include -#include +#include using namespace Dali; -namespace -{ - -} // unnamed namespace - namespace Dali { namespace Toolkit { -const Property::Index Scrollable::PROPERTY_OVERSHOOT_EFFECT_COLOR( Toolkit::Internal::Control::CONTROL_PROPERTY_END_INDEX + 1 ); -const Property::Index Scrollable::PROPERTY_OVERSHOOT_ANIMATION_SPEED( Toolkit::Internal::Control::CONTROL_PROPERTY_END_INDEX + 2 ); - namespace Internal { namespace { -const Vector4 DEFAULT_OVERSHOOT_COLOUR(0.0f, 0.64f, 0.85f, 0.25f); -const float DEFAULT_OVERSHOOT_ANIMATION_SPEED(120.0f); // 120 pixels per second - -// Signals - -const char* const SIGNAL_SCROLL_STARTED = "scroll-started"; -const char* const SIGNAL_SCROLL_COMPLETED = "scroll-completed"; -const char* const SIGNAL_SCROLL_UPDATED = "scroll-updated"; -const char* const SIGNAL_SCROLL_CLAMPED = "scroll-clamped"; BaseHandle Create() { @@ -59,126 +44,75 @@ BaseHandle Create() return BaseHandle(); } -TypeRegistration mType( typeid( Toolkit::Scrollable ), typeid( Toolkit::Control ), Create ); +// Setup properties, signals and actions using the type-registry. +DALI_TYPE_REGISTRATION_BEGIN( Toolkit::Scrollable, Toolkit::Control, Create ); -SignalConnectorType s1( mType, SIGNAL_SCROLL_STARTED, &Scrollable::DoConnectSignal ); -SignalConnectorType s2( mType, SIGNAL_SCROLL_COMPLETED, &Scrollable::DoConnectSignal ); -SignalConnectorType s3( mType, SIGNAL_SCROLL_UPDATED, &Scrollable::DoConnectSignal ); -SignalConnectorType s4( mType, SIGNAL_SCROLL_CLAMPED, &Scrollable::DoConnectSignal ); +DALI_PROPERTY_REGISTRATION( Toolkit, Scrollable, "overshootEffectColor", VECTOR4, OVERSHOOT_EFFECT_COLOR ) +DALI_PROPERTY_REGISTRATION( Toolkit, Scrollable, "overshootAnimationSpeed", FLOAT, OVERSHOOT_ANIMATION_SPEED ) +DALI_PROPERTY_REGISTRATION( Toolkit, Scrollable, "overshootEnabled", BOOLEAN, OVERSHOOT_ENABLED ) +DALI_PROPERTY_REGISTRATION( Toolkit, Scrollable, "overshootSize", VECTOR2, OVERSHOOT_SIZE ) +DALI_PROPERTY_REGISTRATION( Toolkit, Scrollable, "scrollToAlphaFunction", INTEGER, SCROLL_TO_ALPHA_FUNCTION ) -PropertyRegistration property1( mType, - "overshoot-effect-color", - Toolkit::Scrollable::PROPERTY_OVERSHOOT_EFFECT_COLOR, - Property::VECTOR4, - &Scrollable::SetProperty, - &Scrollable::GetProperty ); +DALI_ANIMATABLE_PROPERTY_REGISTRATION( Toolkit, Scrollable, "scrollRelativePosition", VECTOR2, SCROLL_RELATIVE_POSITION) +DALI_ANIMATABLE_PROPERTY_REGISTRATION( Toolkit, Scrollable, "scrollPositionMin", VECTOR2, SCROLL_POSITION_MIN) +DALI_ANIMATABLE_PROPERTY_COMPONENT_REGISTRATION( Toolkit, Scrollable, "scrollPositionMinX", SCROLL_POSITION_MIN_X, SCROLL_POSITION_MIN, 0) +DALI_ANIMATABLE_PROPERTY_COMPONENT_REGISTRATION( Toolkit, Scrollable, "scrollPositionMinY", SCROLL_POSITION_MIN_Y, SCROLL_POSITION_MIN, 1) +DALI_ANIMATABLE_PROPERTY_REGISTRATION( Toolkit, Scrollable, "scrollPositionMax", VECTOR2, SCROLL_POSITION_MAX) +DALI_ANIMATABLE_PROPERTY_COMPONENT_REGISTRATION( Toolkit, Scrollable, "scrollPositionMaxX", SCROLL_POSITION_MAX_X, SCROLL_POSITION_MAX, 0) +DALI_ANIMATABLE_PROPERTY_COMPONENT_REGISTRATION( Toolkit, Scrollable, "scrollPositionMaxY", SCROLL_POSITION_MAX_Y, SCROLL_POSITION_MAX, 1) +DALI_ANIMATABLE_PROPERTY_REGISTRATION( Toolkit, Scrollable, "canScrollVertical", BOOLEAN, CAN_SCROLL_VERTICAL) +DALI_ANIMATABLE_PROPERTY_REGISTRATION( Toolkit, Scrollable, "canScrollHorizontal", BOOLEAN, CAN_SCROLL_HORIZONTAL) -PropertyRegistration property2( mType, - "overshoot-animation-speed", - Toolkit::Scrollable::PROPERTY_OVERSHOOT_ANIMATION_SPEED, - Property::FLOAT, - &Scrollable::SetProperty, - &Scrollable::GetProperty ); +DALI_SIGNAL_REGISTRATION( Toolkit, Scrollable, "scrollStarted", SIGNAL_SCROLL_STARTED ) +DALI_SIGNAL_REGISTRATION( Toolkit, Scrollable, "scrollCompleted", SIGNAL_SCROLL_COMPLETED ) +DALI_SIGNAL_REGISTRATION( Toolkit, Scrollable, "scrollUpdated", SIGNAL_SCROLL_UPDATED ) -} +DALI_TYPE_REGISTRATION_END() -const std::string Scrollable::SCROLLABLE_CAN_SCROLL_VERTICAL( "scrollable-can-scroll-vertical" ); -const std::string Scrollable::SCROLLABLE_CAN_SCROLL_HORIZONTAL( "scrollable-can-scroll-horizontal" ); +const Vector4 DEFAULT_OVERSHOOT_COLOUR(0.0f, 0.64f, 0.85f, 0.25f); +const float DEFAULT_OVERSHOOT_ANIMATION_SPEED(120.0f); // 120 pixels per second +const Vector2 OVERSHOOT_DEFAULT_SIZE( 720.0f, 42.0f ); + +} /////////////////////////////////////////////////////////////////////////////////////////////////// // Scrollable /////////////////////////////////////////////////////////////////////////////////////////////////// -// Scrollable controls are not layout containers so they dont need size negotiation.. -// we dont want size negotiation while scrolling if we can avoid it -Scrollable::Scrollable() -: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS | NO_SIZE_NEGOTIATION ) ), +Scrollable::Scrollable( ControlBehaviour behaviourFlags ) +: Control( ControlBehaviour( behaviourFlags ) ), mOvershootEffectColor( DEFAULT_OVERSHOOT_COLOUR ), mOvershootAnimationSpeed ( DEFAULT_OVERSHOOT_ANIMATION_SPEED ), - mPropertyRelativePosition(Property::INVALID_INDEX), - mPropertyPositionMin(Property::INVALID_INDEX), - mPropertyPositionMax(Property::INVALID_INDEX), - mPropertyScrollDirection(Property::INVALID_INDEX), - mPropertyCanScrollVertical(Property::INVALID_INDEX), - mPropertyCanScrollHorizontal(Property::INVALID_INDEX), - mOvershootEnabled(false) + mOvershootSize( OVERSHOOT_DEFAULT_SIZE ), + mScrollToAlphaFunction( AlphaFunction::EASE_OUT ), + mScrollStartedSignal(), + mScrollUpdatedSignal(), + mScrollCompletedSignal(), + mOvershootEnabled(true) { } Scrollable::~Scrollable() { - // Clear scroll components, forces their destruction before Scrollable is destroyed. - mComponents.clear(); } -void Scrollable::RegisterCommonProperties() +void Scrollable::OnInitialize() { - Actor self = Self(); - - // Register properties. - mPropertyRelativePosition = self.RegisterProperty(Toolkit::Scrollable::SCROLL_RELATIVE_POSITION_PROPERTY_NAME, Vector3::ZERO); - mPropertyPositionMin = self.RegisterProperty(Toolkit::Scrollable::SCROLL_POSITION_MIN_PROPERTY_NAME, Vector3::ZERO); - mPropertyPositionMax = self.RegisterProperty(Toolkit::Scrollable::SCROLL_POSITION_MAX_PROPERTY_NAME, Vector3::ZERO); - mPropertyScrollDirection = self.RegisterProperty(Toolkit::Scrollable::SCROLL_DIRECTION_PROPERTY_NAME, Vector3::ZERO); - mPropertyCanScrollVertical = self.RegisterProperty(SCROLLABLE_CAN_SCROLL_VERTICAL, true); - mPropertyCanScrollHorizontal = self.RegisterProperty(SCROLLABLE_CAN_SCROLL_HORIZONTAL, true); -} - -bool Scrollable::IsScrollComponentEnabled(Toolkit::Scrollable::ScrollComponentType type) const -{ - if(type == Toolkit::Scrollable::OvershootIndicator) - { - return mOvershootEnabled; - } - return (mComponents.find(type) != mComponents.end()); + DevelControl::SetAccessibilityConstructor( Self(), []( Dali::Actor actor ) { + return std::unique_ptr< Dali::Accessibility::Accessible >( + new Control::Impl::AccessibleImpl( actor, Dali::Accessibility::Role::SCROLL_PANE ) ); + } ); } -void Scrollable::EnableScrollComponent(Toolkit::Scrollable::ScrollComponentType type) +bool Scrollable::IsOvershootEnabled() const { - if(type == Toolkit::Scrollable::OvershootIndicator) - { - if( !mOvershootEnabled ) - { - SetOvershootEnabled(true); - mOvershootEnabled = true; - } - return; - } - if( mComponents.find(type) == mComponents.end() ) - { - // Create ScrollComponent - Toolkit::Scrollable scrollable = Toolkit::Scrollable::DownCast(Self()); - Toolkit::ScrollComponent scrollComponent = NewScrollComponent(scrollable, type); - Toolkit::ScrollComponentImpl& component = static_cast(scrollComponent.GetImplementation()); - ScrollComponentPtr componentPtr(&component); - - mComponents[type] = componentPtr; - } + return mOvershootEnabled; } -void Scrollable::DisableScrollComponent(Toolkit::Scrollable::ScrollComponentType type) +void Scrollable::SetOvershootEnabled(bool enable) { - if(type == Toolkit::Scrollable::OvershootIndicator) - { - if( mOvershootEnabled ) - { - SetOvershootEnabled(false); - mOvershootEnabled = false; - } - return; - } - ComponentIter pair = mComponents.find( type ); - - if( mComponents.end() != pair ) - { - ScrollComponentPtr component = pair->second; - - // Disconnect the scroll component first. - component->OnDisconnect(); - - // Destroy ScrollComponent. - mComponents.erase( type ); - } + EnableScrollOvershoot(enable); + mOvershootEnabled = enable; } Vector4 Scrollable::GetOvershootEffectColor() const @@ -196,6 +130,11 @@ float Scrollable::GetOvershootAnimationSpeed() const return mOvershootAnimationSpeed; }; +const Vector2& Scrollable::GetOvershootSize() const +{ + return mOvershootSize; +} + Toolkit::Scrollable::ScrollStartedSignalType& Scrollable::ScrollStartedSignal() { return mScrollStartedSignal; @@ -211,11 +150,6 @@ Toolkit::Scrollable::ScrollCompletedSignalType& Scrollable::ScrollCompletedSigna return mScrollCompletedSignal; } -Toolkit::Scrollable::ScrollClampedSignalType& Scrollable::ScrollClampedSignal() -{ - return mScrollClampedSignal; -} - bool Scrollable::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) { Dali::BaseHandle handle( object ); @@ -235,10 +169,6 @@ bool Scrollable::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface { scrollable.ScrollCompletedSignal().Connect( tracker, functor ); } - else if( 0 == strcmp( signalName.c_str(), SIGNAL_SCROLL_CLAMPED ) ) - { - scrollable.ScrollClampedSignal().Connect( tracker, functor ); - } else { // signalName does not match any signal @@ -257,16 +187,37 @@ void Scrollable::SetProperty( BaseObject* object, Property::Index index, const P Scrollable& scrollableImpl( GetImpl( scrollable ) ); switch( index ) { - case Toolkit::Scrollable::PROPERTY_OVERSHOOT_EFFECT_COLOR: + case Toolkit::Scrollable::Property::OVERSHOOT_EFFECT_COLOR: { scrollableImpl.SetOvershootEffectColor( value.Get() ); break; } - case Toolkit::Scrollable::PROPERTY_OVERSHOOT_ANIMATION_SPEED: + case Toolkit::Scrollable::Property::OVERSHOOT_ANIMATION_SPEED: { scrollableImpl.SetOvershootAnimationSpeed( value.Get() ); break; } + case Toolkit::Scrollable::Property::OVERSHOOT_ENABLED: + { + scrollableImpl.SetOvershootEnabled( value.Get() ); + break; + } + case Toolkit::Scrollable::Property::OVERSHOOT_SIZE: + { + scrollableImpl.SetOvershootSize( value.Get() ); + break; + } + case Toolkit::Scrollable::Property::SCROLL_TO_ALPHA_FUNCTION: + { + int alphaFunction = value.Get(); + + if( alphaFunction >= AlphaFunction::DEFAULT && + alphaFunction < AlphaFunction::COUNT ) + { + scrollableImpl.mScrollToAlphaFunction = static_cast< AlphaFunction::BuiltinFunction >( alphaFunction ); + } + break; + } } } } @@ -282,48 +233,37 @@ Property::Value Scrollable::GetProperty( BaseObject* object, Property::Index ind Scrollable& scrollableImpl( GetImpl( scrollable ) ); switch( index ) { - case Toolkit::Scrollable::PROPERTY_OVERSHOOT_EFFECT_COLOR: + case Toolkit::Scrollable::Property::OVERSHOOT_EFFECT_COLOR: { value = scrollableImpl.GetOvershootEffectColor(); break; } - case Toolkit::Scrollable::PROPERTY_OVERSHOOT_ANIMATION_SPEED: + case Toolkit::Scrollable::Property::OVERSHOOT_ANIMATION_SPEED: { value = scrollableImpl.GetOvershootAnimationSpeed(); break; } + case Toolkit::Scrollable::Property::OVERSHOOT_ENABLED: + { + value = scrollableImpl.IsOvershootEnabled(); + break; + } + case Toolkit::Scrollable::Property::OVERSHOOT_SIZE: + { + value = scrollableImpl.mOvershootSize; + break; + } + case Toolkit::Scrollable::Property::SCROLL_TO_ALPHA_FUNCTION: + { + value = static_cast( scrollableImpl.mScrollToAlphaFunction ); + break; + } } } return value; } -Toolkit::ScrollComponent Scrollable::NewScrollComponent(Toolkit::Scrollable& scrollable, Toolkit::Scrollable::ScrollComponentType type) -{ - Toolkit::ScrollComponent instance; - - switch(type) - { - case Toolkit::Scrollable::VerticalScrollBar: - { - instance = static_cast(Toolkit::ScrollBarInternal::New(scrollable, true)); - break; - } - case Toolkit::Scrollable::HorizontalScrollBar: - { - instance = static_cast(Toolkit::ScrollBarInternal::New(scrollable, false)); - break; - } - case Toolkit::Scrollable::OvershootIndicator: - { - DALI_ASSERT_ALWAYS(!"Unrecognized component type"); - break; - } - } - - return instance; -} - } // namespace Internal } // namespace Toolkit