projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove dead slide effect code and incorrect ref-objects from scroll effects
[platform/core/uifw/dali-toolkit.git]
/
base
/
dali-toolkit
/
internal
/
controls
/
scrollable
/
scroll-view
/
scroll-view-page-spiral-effect-impl.cpp
diff --git
a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp
b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp
index
61c51ef
..
3b89b08
100644
(file)
--- a/
base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp
+++ b/
base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp
@@
-69,7
+69,7
@@
using namespace ScrollViewHelperFunctions;
* relative to the middle of the screen.
* When at middle of the screen the position is not altered.
*/
* relative to the middle of the screen.
* When at middle of the screen the position is not altered.
*/
-class ScrollPageSpiralEffectInfo
: public Dali::RefObject
+class ScrollPageSpiralEffectInfo
{
public:
{
public:
@@
-336,8
+336,6
@@
public:
bool mScrollWrap; ///< Whether the scroll view wraps or not.
};
bool mScrollWrap; ///< Whether the scroll view wraps or not.
};
-typedef IntrusivePtr<ScrollPageSpiralEffectInfo> ScrollPageSpiralEffectInfoPtr;
-
/**
* Helper: Applies the 3D scroll cube constraints to the child actor
*
/**
* Helper: Applies the 3D scroll cube constraints to the child actor
*
@@
-347,7
+345,7
@@
typedef IntrusivePtr<ScrollPageSpiralEffectInfo> ScrollPageSpiralEffectInfoPtr;
*/
void ApplyScrollCubeConstraints(Toolkit::ScrollView scrollView,
Actor child,
*/
void ApplyScrollCubeConstraints(Toolkit::ScrollView scrollView,
Actor child,
- ScrollPageSpiralEffectInfo
Ptr
info)
+ ScrollPageSpiralEffectInfo
&
info)
{
// Apply constraints to this actor //
Constraint constraint;
{
// Apply constraints to this actor //
Constraint constraint;
@@
-405,7
+403,7
@@
void ScrollViewPageSpiralEffect::ApplyToPage( Actor page, const Vector2& spiralA
if ( scrollView )
{
if ( scrollView )
{
- ScrollPageSpiralEffectInfo
Ptr info(new ScrollPageSpiralEffectInfo( spiralAngle, GetImpl( scrollView ).GetWrapMode() )
);
+ ScrollPageSpiralEffectInfo
info( spiralAngle, GetImpl( scrollView ).GetWrapMode()
);
ApplyScrollCubeConstraints( scrollView, page, info );
}
}
ApplyScrollCubeConstraints( scrollView, page, info );
}
}