X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-view-impl.h;h=406172728746cf9f7044b9cd982d27adeb7c2006;hp=4d871a79538cf702fdde6f1f13580dd8c0227619;hb=3ce558ca09f928cb18cacfa80f52eb0c591181b9;hpb=e0c063be9e7ecde0e5665079289489d456828abf 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 4d871a7..4061727 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 @@ -47,6 +47,8 @@ typedef IntrusivePtr ScrollInternalConstraintsPtr; class ScrollOvershootIndicator; typedef IntrusivePtr ScrollOvershootIndicatorPtr; +class ScrollViewPropertyHandler; + /** * @copydoc Toolkit::ScrollView */ @@ -774,13 +776,6 @@ private: void SnapInternalYTo(float position); /** - * This is called internally whenever the Scroll Rulers are - * modified. This will update the properties: 'scrollPositionMin' - * and 'scrollPositionMax' to reflect the changes. - */ - void UpdatePropertyDomain(); - - /** * Called when the gesture starts. */ void GestureStarted(); @@ -821,20 +816,6 @@ private: void FinishTransform(); /** - * Returns overshoot vector based on current position - * - * Overshoot vector is defined as how far outside of bounds - * the viewport is trying to view (prior to being clamped). - * - * an overshoot of (100,50), means user is in bottom right corner, - * trying to pan +100 to the right, and +50 below. This can be used - * to determine an effect, such as stretching. - * - * @param[in] position The position for which you wish to obtain overshoot vector - */ - Vector2 GetOvershoot(Vector2& position) const; - - /** * Clamps position within the domain set up by X/Y Rulers * * @param[in,out] position The position you wish to clamp @@ -924,13 +905,6 @@ private: */ void OnScrollUpdateNotification(Dali::PropertyNotification& source); - /** - * Set up default rulers using a property map - * @param[in] scrollModeMap A map defining the characteristics of X and Y scrolling - * using either FixedRuler or DefaultRuler. - */ - void SetScrollMode(const Property::Map& scrollModeMap); - private: // Undefined ScrollView(const ScrollView&); @@ -1020,6 +994,7 @@ private: bool mTransientScrollBar : 1; ///< True if scroll-bar should be automatically show/hidden during/after panning friend ScrollViewConstraints; + friend ScrollViewPropertyHandler; }; /**