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
Use Handle::GetCurrentProperty instead of Devel API
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
scrollable
/
item-view
/
item-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
index
6794590
..
7f27217
100755
(executable)
--- a/
dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
@@
-407,7
+407,7
@@
ItemLayoutPtr ItemView::GetActiveLayout() const
float ItemView::GetCurrentLayoutPosition(unsigned int itemId) const
{
float ItemView::GetCurrentLayoutPosition(unsigned int itemId) const
{
- return Self().Get
Property<float
>( Toolkit::ItemView::Property::LAYOUT_POSITION ) + static_cast<float>( itemId );
+ return Self().Get
CurrentProperty< float
>( Toolkit::ItemView::Property::LAYOUT_POSITION ) + static_cast<float>( itemId );
}
void ItemView::ActivateLayout(unsigned int layoutIndex, const Vector3& targetSize, float durationSeconds)
}
void ItemView::ActivateLayout(unsigned int layoutIndex, const Vector3& targetSize, float durationSeconds)
@@
-1233,7
+1233,7
@@
void ItemView::OnPan( const PanGesture& gesture )
float firstItemScrollPosition = ClampFirstItemPosition(layoutPositionDelta, layoutSize, *mActiveLayout);
float firstItemScrollPosition = ClampFirstItemPosition(layoutPositionDelta, layoutSize, *mActiveLayout);
- float currentOvershoot = self.Get
Property<float>(Toolkit::ItemView::Property::OVERSHOOT
);
+ float currentOvershoot = self.Get
CurrentProperty< float >( Toolkit::ItemView::Property::OVERSHOOT
);
self.SetProperty(Toolkit::ItemView::Property::LAYOUT_POSITION, firstItemScrollPosition );
self.SetProperty(Toolkit::ItemView::Property::LAYOUT_POSITION, firstItemScrollPosition );
@@
-1645,7
+1645,7
@@
void ItemView::AnimateScrollOvershoot(float overshootAmount, bool animateBack)
if(mOvershootAnimationSpeed > Math::MACHINE_EPSILON_0)
{
if(mOvershootAnimationSpeed > Math::MACHINE_EPSILON_0)
{
- float currentOvershoot = self.Get
Property<float>(Toolkit::ItemView::Property::OVERSHOOT
);
+ float currentOvershoot = self.Get
CurrentProperty< float >( Toolkit::ItemView::Property::OVERSHOOT
);
float duration = 0.0f;
if (mOvershootOverlay)
float duration = 0.0f;
if (mOvershootOverlay)