X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-view-cube-effect-impl.cpp;h=d2803f137ba8e7765a8946dc7f1c4e11db5a2d9b;hb=refs%2Fheads%2Ftizen_3.0.2015.q1_common;hp=65fdd5f2cb540de4df8e312b581ed76460bea994;hpb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp index 65fdd5f..d2803f1 100644 --- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp +++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp @@ -44,7 +44,7 @@ namespace // unnamed namespace * When at middle of the screen the position is not altered. * When one screen away from middle the position is rotated about it's origin + mAnchor */ -class ScrollCubeEffectInfo : public Dali::RefObject +class ScrollCubeEffectInfo { public: @@ -285,8 +285,6 @@ public: Vector3 mPositionSwing; ///< Maximum amount in X and Y axes to alter position. }; -typedef IntrusivePtr ScrollCubeEffectInfoPtr; - /** * Helper: Applies the 3D scroll cube constraints to the child actor * @@ -297,7 +295,7 @@ typedef IntrusivePtr ScrollCubeEffectInfoPtr; void ApplyScrollCubeConstraints(Toolkit::ScrollView scrollView, Actor child, Actor parentPage, - ScrollCubeEffectInfoPtr info) + const ScrollCubeEffectInfo& info) { // Apply constraints to this actor // Constraint constraint; @@ -363,7 +361,7 @@ void ScrollViewCubeEffect::ApplyToActor(Actor child, const Vector2& angleSwing, const Vector2& positionSwing) { - ScrollCubeEffectInfoPtr info(new ScrollCubeEffectInfo(anchor, angleSwing, positionSwing)); + ScrollCubeEffectInfo info( anchor, angleSwing, positionSwing ); ApplyScrollCubeConstraints( GetScrollView(), child, child.GetParent(), info ); } @@ -374,7 +372,7 @@ void ScrollViewCubeEffect::ApplyToActor(Actor child, const Vector2& angleSwing, const Vector2& positionSwing) { - ScrollCubeEffectInfoPtr info(new ScrollCubeEffectInfo(anchor, angleSwing, positionSwing)); + ScrollCubeEffectInfo info( anchor, angleSwing, positionSwing ); ApplyScrollCubeConstraints( GetScrollView(), child, parentPage, info ); }