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=d99e5e1da3efa908f96bdb6fd2147fa1675f3baa;hb=refs%2Fchanges%2F42%2F265542%2F2;hpb=77aecaf3903cb08ea1eea8da87a19eaa02a2a54b diff --git a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp index d99e5e1..609476a 100644 --- a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp @@ -1,186 +1,174 @@ -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// +/* + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +// EXTERNAL INCLUDES +#include +#include +#include // for strcmp // INTERNAL INCLUDES +#include #include -#include using namespace Dali; -namespace -{ - -} // unnamed namespace - namespace Dali { - namespace Toolkit { - namespace Internal { - namespace { - BaseHandle Create() { // empty handle as we cannot create Scrollable (but type registered for scroll signal) 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, Toolkit::Scrollable::SIGNAL_SCROLL_STARTED, &Scrollable::DoConnectSignal); -SignalConnectorType s2(mType, Toolkit::Scrollable::SIGNAL_SCROLL_COMPLETED, &Scrollable::DoConnectSignal); -SignalConnectorType s3(mType, Toolkit::Scrollable::SIGNAL_SCROLL_UPDATED, &Scrollable::DoConnectSignal); -SignalConnectorType s4(mType, Toolkit::Scrollable::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) -} +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 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); + +} // namespace /////////////////////////////////////////////////////////////////////////////////////////////////// // Scrollable /////////////////////////////////////////////////////////////////////////////////////////////////// -Scrollable::Scrollable() -: ControlImpl(true/*requires touch*/), - mPropertyRelativePosition(Property::INVALID_INDEX), - mPropertyPositionMin(Property::INVALID_INDEX), - mPropertyPositionMax(Property::INVALID_INDEX), - mPropertyScrollDirection(Property::INVALID_INDEX), - 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() { - // Clear scroll components, forces their destruction before Scrollable is destroyed. - mComponents.clear(); } -void Scrollable::RegisterCommonProperties() +bool Scrollable::AccessibleImpl::IsScrollable() { - 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); + 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) - { - 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) - { - SetOvershootEnabled(false); - mOvershootEnabled = false; - return; - } - ComponentIter pair = mComponents.find( type ); - - if( mComponents.end() != pair ) - { - ScrollComponentPtr component = pair->second; + EnableScrollOvershoot(enable); + mOvershootEnabled = enable; +} - // Disconnect the scroll component first. - component->OnDisconnect(); +Vector4 Scrollable::GetOvershootEffectColor() const +{ + return mOvershootEffectColor; +}; - // Destroy ScrollComponent. - mComponents.erase( type ); - } +void Scrollable::SetOvershootAnimationSpeed(float pixelsPerSecond) +{ + mOvershootAnimationSpeed = pixelsPerSecond; } -Toolkit::Scrollable::ScrollStartedSignalV2& Scrollable::ScrollStartedSignal() +float Scrollable::GetOvershootAnimationSpeed() const { - return mScrollStartedSignalV2; + return mOvershootAnimationSpeed; +}; + +const Vector2& Scrollable::GetOvershootSize() const +{ + return mOvershootSize; } -Toolkit::Scrollable::ScrollUpdatedSignalV2& Scrollable::ScrollUpdatedSignal() +Toolkit::Scrollable::ScrollStartedSignalType& Scrollable::ScrollStartedSignal() { - return mScrollUpdatedSignalV2; + return mScrollStartedSignal; } -Toolkit::Scrollable::ScrollCompletedSignalV2& Scrollable::ScrollCompletedSignal() +Toolkit::Scrollable::ScrollUpdatedSignalType& Scrollable::ScrollUpdatedSignal() { - return mScrollCompletedSignalV2; + return mScrollUpdatedSignal; } -Toolkit::Scrollable::ScrollClampedSignalV2& Scrollable::ScrollClampedSignal() +Toolkit::Scrollable::ScrollCompletedSignalType& Scrollable::ScrollCompletedSignal() { - return mScrollClampedSignalV2; + 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( Toolkit::Scrollable::SIGNAL_SCROLL_STARTED == signalName ) - { - scrollable.ScrollStartedSignal().Connect( tracker, functor ); - } - else if( Toolkit::Scrollable::SIGNAL_SCROLL_UPDATED == signalName ) + if(0 == strcmp(signalName.c_str(), SIGNAL_SCROLL_STARTED)) { - scrollable.ScrollUpdatedSignal().Connect( tracker, functor ); + scrollable.ScrollStartedSignal().Connect(tracker, functor); } - else if( Toolkit::Scrollable::SIGNAL_SCROLL_COMPLETED == signalName ) + else if(0 == strcmp(signalName.c_str(), SIGNAL_SCROLL_UPDATED)) { - scrollable.ScrollCompletedSignal().Connect( tracker, functor ); + scrollable.ScrollUpdatedSignal().Connect(tracker, functor); } - else if( Toolkit::Scrollable::SIGNAL_SCROLL_CLAMPED == signalName ) + else if(0 == strcmp(signalName.c_str(), SIGNAL_SCROLL_COMPLETED)) { - scrollable.ScrollClampedSignal().Connect( tracker, functor ); + scrollable.ScrollCompletedSignal().Connect(tracker, functor); } else { @@ -191,29 +179,90 @@ bool Scrollable::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface return connected; } -Toolkit::ScrollComponent Scrollable::NewScrollComponent(Toolkit::Scrollable& scrollable, Toolkit::Scrollable::ScrollComponentType type) +void Scrollable::SetProperty(BaseObject* object, Property::Index index, const Property::Value& value) { - Toolkit::ScrollComponent instance; + Toolkit::Scrollable scrollable = Toolkit::Scrollable::DownCast(Dali::BaseHandle(object)); - switch(type) + if(scrollable) { - case Toolkit::Scrollable::VerticalScrollBar: - { - instance = static_cast(Toolkit::ScrollBarInternal::New(scrollable, true)); - break; - } - case Toolkit::Scrollable::HorizontalScrollBar: + Scrollable& scrollableImpl(GetImpl(scrollable)); + switch(index) { - instance = static_cast(Toolkit::ScrollBarInternal::New(scrollable, false)); - break; + case Toolkit::Scrollable::Property::OVERSHOOT_EFFECT_COLOR: + { + scrollableImpl.SetOvershootEffectColor(value.Get()); + break; + } + 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); + } + break; + } } - default: + } +} + +Property::Value Scrollable::GetProperty(BaseObject* object, Property::Index index) +{ + Property::Value value; + + Toolkit::Scrollable scrollable = Toolkit::Scrollable::DownCast(Dali::BaseHandle(object)); + + if(scrollable) + { + Scrollable& scrollableImpl(GetImpl(scrollable)); + switch(index) { - DALI_ASSERT_ALWAYS(true && "Unrecognized component type"); + case Toolkit::Scrollable::Property::OVERSHOOT_EFFECT_COLOR: + { + value = scrollableImpl.GetOvershootEffectColor(); + break; + } + 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 instance; + return value; } } // namespace Internal