X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-view-impl.h;h=9a16624cd8e8b0314eec4f929253e568dae6ba52;hb=0ce6aeca2002e7a2f9f29ea71f0cf146702b351d;hp=eb4587627b1cfc6be996ddf94e6d68ec83643abb;hpb=dd846cfb29b79dcc270562a4d46de1e28f545254;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h index eb45876..9a16624 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h @@ -191,6 +191,13 @@ public: void SetRulerY(RulerPtr ruler); /** + * Retrieve the touch sensitivity. + * + * @return whether the touch sensitivity is true or false. + */ + bool GetScrollSensitive(); + + /** * @copydoc Toolkit::ScrollView::SetScrollSensitive */ void SetScrollSensitive(bool sensitive); @@ -206,11 +213,25 @@ public: void SetSnapOvershootAlphaFunction(AlphaFunction alpha); /** + * Retrieve the duartion of Snap Overshoot animation + * + * @return the duration. + */ + float GetSnapOvershootDuration(); + + /** * @copydoc Toolkit::ScrollView::SetSnapOvershootDuration */ void SetSnapOvershootDuration(float duration); /** + * Retrieve whether Actor Auto-Snap mode is enabled or not. + * + * @return Actor Auto-Snap mode Enabled flag. + */ + bool GetActorAutoSnap(); + + /** * @copydoc Toolkit::ScrollView::SetActorAutoSnap */ void SetActorAutoSnap(bool enable); @@ -323,14 +344,14 @@ public: void SetMaxFlickSpeed(float speed); /** - * @copydoc Toolkit::ScrollView::GetMouseWheelScrollDistanceStep + * @copydoc Toolkit::ScrollView::GetWheelScrollDistanceStep */ - Vector2 GetMouseWheelScrollDistanceStep() const; + Vector2 GetWheelScrollDistanceStep() const; /** - * @copydoc Toolkit::ScrollView::SetMouseWheelScrollDistanceStep + * @copydoc Toolkit::ScrollView::SetWheelScrollDistanceStep */ - void SetMouseWheelScrollDistanceStep(Vector2 step); + void SetWheelScrollDistanceStep(Vector2 step); /** * @copydoc Toolkit::ScrollView::GetCurrentPage @@ -343,16 +364,6 @@ public: Vector2 GetCurrentScrollPosition() const; /** - * @copydoc Toolkit::ScrollView::SetScrollPosition - */ - void SetScrollPosition(const Vector2& position); - - /** - * @copydoc Toolkit::Scrollable::GetDomainSize - */ - Vector2 GetDomainSize() const; - - /** * @copydoc ScrollTo(const Vector2&) */ void TransformTo(const Vector2& position, @@ -483,10 +494,33 @@ public: void RemoveOverlay(Actor actor); /** + * @copydoc Toolkit::Internal::Scrollable::SetOvershootSize + */ + void SetOvershootSize( const Vector2& size ); + + /** * @copydoc Toolkit::Internal::Scrollable::SetOvershootEffectColor */ void SetOvershootEffectColor( const Vector4& color ); + //properties + + /** + * Called when a property of an object of this type is set. + * @param[in] object The object whose property is set. + * @param[in] index The property index. + * @param[in] value The new property value. + */ + static void SetProperty( BaseObject* object, Property::Index index, const Property::Value& value ); + + /** + * Called to retrieve a property of an object of this type. + * @param[in] object The object whose property is to be retrieved. + * @param[in] index The property index. + * @return The current value of the property. + */ + static Property::Value GetProperty( BaseObject* object, Property::Index index ); + public: //Signals /** @@ -505,7 +539,7 @@ public: //Signals */ static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ); -private: // private overriden functions from CustomActorImpl and Controls +private: // private overridden functions from CustomActorImpl and Controls /** * @copydoc Dali::CustomActorImpl::OnSizeAnimation(Animation&, const Vector3&) @@ -513,9 +547,9 @@ private: // private overriden functions from CustomActorImpl and Controls virtual void OnSizeAnimation(Animation& animation, const Vector3& targetSize); /** - * @copydoc Dali::Control::OnControlSizeSet(const Vector3&) + * @copydoc CustomActorImpl::OnSizeSet(const Vector3&) */ - virtual void OnControlSizeSet( const Vector3& size ); + virtual void OnSizeSet( const Vector3& size ); /** * From CustomActorImpl; called after a child has been added to the owning actor. @@ -530,21 +564,11 @@ private: // private overriden functions from CustomActorImpl and Controls virtual void OnChildRemove(Actor& child); /** - * From CustomActorImpl; called after a touch-signal is received by the owning actor. - * - * We don't listen to these events as content within the contain may consume events. - * - * @param[in] event The touch event. - * @return True if the event should be consumed. - */ - virtual bool OnTouchEvent(const TouchEvent& event); - - /** - * From CustomActorImpl; called after a mouse-wheel-event is received by the owning actor. - * @param[in] event The mouse wheel event. + * From CustomActorImpl; called after a wheelEvent is received by the owning actor. + * @param[in] event The wheel event. * @return True if the event should be consumed. */ - virtual bool OnMouseWheelEvent(const MouseWheelEvent& event); + virtual bool OnWheelEvent(const WheelEvent& event); /** * @copydoc Toolkit::Control::OnInitialize() @@ -552,14 +576,14 @@ private: // private overriden functions from CustomActorImpl and Controls virtual void OnInitialize(); /** - * @copydoc Toolkit::Control::OnControlStageConnection() + * @copydoc CustomActorImpl::OnStageConnection() */ - virtual void OnControlStageConnection(); + virtual void OnStageConnection( int depth ); /** - * @copydoc Toolkit::Control::OnControlStageConnection() + * @copydoc CustomActorImpl::OnStageDisconnection() */ - virtual void OnControlStageDisconnection(); + virtual void OnStageDisconnection(); /** * @copydoc Toolkit::Control::OnAccessibilityPan() @@ -574,6 +598,17 @@ private: // private overriden functions from CustomActorImpl and Controls private: /** + * Called after a touchSignal is received by the owning actor. + * + * We don't consume these events as content within the container may consume events. + * + * @param[in] actor The touched actor. + * @param[in] touch The touch information. + * @return True if the event should be consumed. + */ + bool OnTouch( Actor actor, const TouchData& touch ); + + /** * Start a timer which calls OnTouchDownTimeout() */ void StartTouchDownTimer(); @@ -658,8 +693,8 @@ private: /** * This is called internally whenever the Scroll Rulers are - * modified. This will update the properties: 'scroll-position-min' - * and 'scroll-position-max' to reflect the changes. + * modified. This will update the properties: 'scrollPositionMin' + * and 'scrollPositionMax' to reflect the changes. */ void UpdatePropertyDomain(); @@ -860,7 +895,7 @@ private: Vector2 mLastVelocity; ///< Record the last velocity from PanGesture (Finish event doesn't have correct velocity) LockAxis mLockAxis; - Timer mTouchDownTimer; ///< Used to interrupt snap-animation. This cannot be done in OnTouchEvent without breaking fast flick behavior. + Timer mTouchDownTimer; ///< Used to interrupt snap-animation. This cannot be done in OnTouch without breaking fast flick behavior. float mScrollUpdateDistance; ///< Distance for scrolling to travel for the scroll update notifications Dali::PropertyNotification mScrollXUpdateNotification; ///< scroll x position update notification @@ -888,7 +923,7 @@ private: float mFlickSpeedCoefficient; ///< Flick velocity coefficient. Input touch velocity is multiplied by this. float mMaxFlickSpeed; ///< Maximum flick speed. Maximum speed of flick in stage.lengths/sec. - Vector2 mMouseWheelScrollDistanceStep; ///< The step of scroll distance in actor coordinates in X and Y axes for each mouse wheel event received. + Vector2 mWheelScrollDistanceStep; ///< The step of scroll distance in actor coordinates in X and Y axes for each wheel event received. //ScrollInternalConstraintsPtr mScrollInternalConstraints; Constraint mScrollMainInternalPrePositionConstraint; @@ -905,8 +940,7 @@ private: Toolkit::ScrollView::SnapStartedSignalType mSnapStartedSignal; - bool mInAccessibilityPan : 1; ///< With AccessibilityPan its easier to move between snap positions - bool mInitialized:1; + bool mInAccessibilityPan:1; ///< With AccessibilityPan its easier to move between snap positions bool mScrolling:1; ///< Flag indicating whether the scroll view is being scrolled (by user or animation) bool mScrollInterrupted:1; ///< Flag set for when a down event interrupts a scroll bool mPanning:1; ///< Whether scroll view is currently panning or not