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-carousel-effect-impl.cpp
diff --git
a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp
b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp
index
87e9a58
..
fd352cb
100644
(file)
--- a/
base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp
+++ b/
base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp
@@
-63,7
+63,7
@@
Property::Index SafeRegisterProperty( Handle& handle, const std::string& name, P
* move the Actor's edge visually away from the neighboring actor, as they rotate
* around their default anchor point.
*/
* move the Actor's edge visually away from the neighboring actor, as they rotate
* around their default anchor point.
*/
-class ScrollCarouselEffectInfo
: public Dali::RefObject
+class ScrollCarouselEffectInfo
{
public:
{
public:
@@
-212,8
+212,6
@@
public:
Vector2 mVisibilityThreshold; ///< Threshold for when to to switch off visibility of Actor (for performance)
};
Vector2 mVisibilityThreshold; ///< Threshold for when to to switch off visibility of Actor (for performance)
};
-typedef IntrusivePtr<ScrollCarouselEffectInfo> ScrollCarouselEffectInfoPtr;
-
/**
* Helper: Applies the 3D scroll carousel constraints to the child actor
*
/**
* Helper: Applies the 3D scroll carousel constraints to the child actor
*
@@
-223,7
+221,7
@@
typedef IntrusivePtr<ScrollCarouselEffectInfo> ScrollCarouselEffectInfoPtr;
*/
void ApplyScrollCarouselConstraints(Toolkit::ScrollView scrollView,
Actor child,
*/
void ApplyScrollCarouselConstraints(Toolkit::ScrollView scrollView,
Actor child,
- ScrollCarouselEffectInfo
Ptr
info)
+ ScrollCarouselEffectInfo
&
info)
{
// Apply constraints to this actor //
Constraint constraint;
{
// Apply constraints to this actor //
Constraint constraint;
@@
-284,7
+282,7
@@
ScrollViewCarouselEffect::~ScrollViewCarouselEffect()
void ScrollViewCarouselEffect::ApplyToActor(Actor child, const Vector2& angleSwing)
{
void ScrollViewCarouselEffect::ApplyToActor(Actor child, const Vector2& angleSwing)
{
- ScrollCarouselEffectInfo
Ptr info(new ScrollCarouselEffectInfo(angleSwing)
);
+ ScrollCarouselEffectInfo
info( angleSwing
);
ApplyScrollCarouselConstraints( GetScrollView(), child, info );
}
ApplyScrollCarouselConstraints( GetScrollView(), child, info );
}