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=609476a6eed961cfbe3eb1c4bc49126779a41d14;hp=36934c5035348c8b2030fa42e6ce9ac1d29c979c;hb=refs%2Fchanges%2F42%2F265542%2F2;hpb=61be2f8d3c96e01da8e6ade2a76a192ff6ab6945 diff --git a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp index 36934c5..609476a 100644 --- a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp @@ -16,28 +16,24 @@ */ // EXTERNAL INCLUDES -#include // for strcmp -#include #include +#include +#include // for strcmp // INTERNAL INCLUDES +#include #include -#include using namespace Dali; namespace Dali { - namespace Toolkit { - namespace Internal { - namespace { - BaseHandle Create() { // empty handle as we cannot create Scrollable (but type registered for scroll signal) @@ -45,112 +41,79 @@ BaseHandle Create() } // Setup properties, signals and actions using the type-registry. -DALI_TYPE_REGISTRATION_BEGIN( Toolkit::Scrollable, Toolkit::Control, Create ); - -DALI_PROPERTY_REGISTRATION( Toolkit, Scrollable, "overshoot-effect-color", VECTOR4, OVERSHOOT_EFFECT_COLOR ) -DALI_PROPERTY_REGISTRATION( Toolkit, Scrollable, "overshoot-animation-speed", FLOAT, OVERSHOOT_ANIMATION_SPEED ) - -DALI_ANIMATABLE_PROPERTY_REGISTRATION( Toolkit, Scrollable, "scroll-relative-position", VECTOR3, SCROLL_RELATIVE_POSITION ) -DALI_ANIMATABLE_PROPERTY_REGISTRATION( Toolkit, Scrollable, "scroll-position-min", VECTOR3, SCROLL_POSITION_MIN ) -DALI_ANIMATABLE_PROPERTY_REGISTRATION( Toolkit, Scrollable, "scroll-position-max", VECTOR3, SCROLL_POSITION_MAX ) -DALI_ANIMATABLE_PROPERTY_REGISTRATION( Toolkit, Scrollable, "scroll-direction", VECTOR3, SCROLL_DIRECTION ) -DALI_ANIMATABLE_PROPERTY_REGISTRATION( Toolkit, Scrollable, "can-scroll-vertical", BOOLEAN, CAN_SCROLL_VERTICAL ) -DALI_ANIMATABLE_PROPERTY_REGISTRATION( Toolkit, Scrollable, "can-scroll-horizontal", BOOLEAN, CAN_SCROLL_HORIZONTAL ) - -DALI_SIGNAL_REGISTRATION( Toolkit, Scrollable, "scroll-started", SIGNAL_SCROLL_STARTED ) -DALI_SIGNAL_REGISTRATION( Toolkit, Scrollable, "scroll-completed", SIGNAL_SCROLL_COMPLETED ) -DALI_SIGNAL_REGISTRATION( Toolkit, Scrollable, "scroll-updated", SIGNAL_SCROLL_UPDATED ) +DALI_TYPE_REGISTRATION_BEGIN(Toolkit::Scrollable, Toolkit::Control, Create); + +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) + +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) + +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 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 float DEFAULT_OVERSHOOT_ANIMATION_SPEED(120.0f); // 120 pixels per second +const Vector2 OVERSHOOT_DEFAULT_SIZE(720.0f, 42.0f); -} +} // namespace /////////////////////////////////////////////////////////////////////////////////////////////////// // 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 | DISABLE_SIZE_NEGOTIATION ) ), - mOvershootEffectColor( DEFAULT_OVERSHOOT_COLOUR ), - mOvershootAnimationSpeed ( DEFAULT_OVERSHOOT_ANIMATION_SPEED ), - mOvershootEnabled(false) +Scrollable::Scrollable(ControlBehaviour behaviourFlags) +: Control(ControlBehaviour(behaviourFlags)), + mOvershootEffectColor(DEFAULT_OVERSHOOT_COLOUR), + mOvershootAnimationSpeed(DEFAULT_OVERSHOOT_ANIMATION_SPEED), + mOvershootSize(OVERSHOOT_DEFAULT_SIZE), + mScrollToAlphaFunction(AlphaFunction::EASE_OUT), + mScrollStartedSignal(), + mScrollUpdatedSignal(), + mScrollCompletedSignal(), + mOvershootEnabled(true) { } -Scrollable::Scrollable( ControlBehaviour behaviourFlags ) -: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS | behaviourFlags ) ), - mOvershootEffectColor( DEFAULT_OVERSHOOT_COLOUR ), - mOvershootAnimationSpeed ( DEFAULT_OVERSHOOT_ANIMATION_SPEED ), - mOvershootEnabled(false) +Scrollable::~Scrollable() { } -Scrollable::~Scrollable() +bool Scrollable::AccessibleImpl::IsScrollable() { - // Clear scroll components, forces their destruction before Scrollable is destroyed. - mComponents.clear(); + return true; } -bool Scrollable::IsScrollComponentEnabled(Toolkit::Scrollable::ScrollComponentType type) const +void Scrollable::OnInitialize() { - if(type == Toolkit::Scrollable::OvershootIndicator) - { - return mOvershootEnabled; - } - return (mComponents.find(type) != mComponents.end()); + DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) { + return std::unique_ptr( + new 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 @@ -158,7 +121,7 @@ Vector4 Scrollable::GetOvershootEffectColor() const return mOvershootEffectColor; }; -void Scrollable::SetOvershootAnimationSpeed( float pixelsPerSecond ) +void Scrollable::SetOvershootAnimationSpeed(float pixelsPerSecond) { mOvershootAnimationSpeed = pixelsPerSecond; } @@ -168,6 +131,11 @@ float Scrollable::GetOvershootAnimationSpeed() const return mOvershootAnimationSpeed; }; +const Vector2& Scrollable::GetOvershootSize() const +{ + return mOvershootSize; +} + Toolkit::Scrollable::ScrollStartedSignalType& Scrollable::ScrollStartedSignal() { return mScrollStartedSignal; @@ -183,24 +151,24 @@ Toolkit::Scrollable::ScrollCompletedSignalType& Scrollable::ScrollCompletedSigna return mScrollCompletedSignal; } -bool Scrollable::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) +bool Scrollable::DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor) { - Dali::BaseHandle handle( object ); + Dali::BaseHandle handle(object); - bool connected( true ); - Toolkit::Scrollable scrollable = Toolkit::Scrollable::DownCast( handle ); + bool connected(true); + Toolkit::Scrollable scrollable = Toolkit::Scrollable::DownCast(handle); - if( 0 == strcmp( signalName.c_str(), SIGNAL_SCROLL_STARTED ) ) + if(0 == strcmp(signalName.c_str(), SIGNAL_SCROLL_STARTED)) { - scrollable.ScrollStartedSignal().Connect( tracker, functor ); + scrollable.ScrollStartedSignal().Connect(tracker, functor); } - else if( 0 == strcmp( signalName.c_str(), SIGNAL_SCROLL_UPDATED ) ) + else if(0 == strcmp(signalName.c_str(), SIGNAL_SCROLL_UPDATED)) { - scrollable.ScrollUpdatedSignal().Connect( tracker, functor ); + scrollable.ScrollUpdatedSignal().Connect(tracker, functor); } - else if( 0 == strcmp( signalName.c_str(), SIGNAL_SCROLL_COMPLETED ) ) + else if(0 == strcmp(signalName.c_str(), SIGNAL_SCROLL_COMPLETED)) { - scrollable.ScrollCompletedSignal().Connect( tracker, functor ); + scrollable.ScrollCompletedSignal().Connect(tracker, functor); } else { @@ -211,39 +179,60 @@ bool Scrollable::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface return connected; } -void Scrollable::SetProperty( BaseObject* object, Property::Index index, const Property::Value& value ) +void Scrollable::SetProperty(BaseObject* object, Property::Index index, const Property::Value& value) { - Toolkit::Scrollable scrollable = Toolkit::Scrollable::DownCast( Dali::BaseHandle( object ) ); + Toolkit::Scrollable scrollable = Toolkit::Scrollable::DownCast(Dali::BaseHandle(object)); - if( scrollable ) + if(scrollable) { - Scrollable& scrollableImpl( GetImpl( scrollable ) ); - switch( index ) + Scrollable& scrollableImpl(GetImpl(scrollable)); + switch(index) { case Toolkit::Scrollable::Property::OVERSHOOT_EFFECT_COLOR: { - scrollableImpl.SetOvershootEffectColor( value.Get() ); + scrollableImpl.SetOvershootEffectColor(value.Get()); break; } case Toolkit::Scrollable::Property::OVERSHOOT_ANIMATION_SPEED: { - scrollableImpl.SetOvershootAnimationSpeed( value.Get() ); + 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); + } break; } } } } -Property::Value Scrollable::GetProperty( BaseObject* object, Property::Index index ) +Property::Value Scrollable::GetProperty(BaseObject* object, Property::Index index) { Property::Value value; - Toolkit::Scrollable scrollable = Toolkit::Scrollable::DownCast( Dali::BaseHandle( object ) ); + Toolkit::Scrollable scrollable = Toolkit::Scrollable::DownCast(Dali::BaseHandle(object)); - if( scrollable ) + if(scrollable) { - Scrollable& scrollableImpl( GetImpl( scrollable ) ); - switch( index ) + Scrollable& scrollableImpl(GetImpl(scrollable)); + switch(index) { case Toolkit::Scrollable::Property::OVERSHOOT_EFFECT_COLOR: { @@ -255,38 +244,27 @@ Property::Value Scrollable::GetProperty( BaseObject* object, Property::Index ind 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