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
ScrollBar refactoring
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
scrollable
/
scroll-view
/
scroll-view-constraints.cpp
diff --git
a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp
b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp
index
e7cec29
..
ac3b3ed
100644
(file)
--- a/
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp
+++ b/
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp
@@
-32,7
+32,7
@@
namespace Toolkit
void MoveActorConstraint( Vector3& current, const PropertyInputContainer& inputs )
{
void MoveActorConstraint( Vector3& current, const PropertyInputContainer& inputs )
{
- current +=
inputs[0]->GetVector3(
);
+ current +=
Vector3(inputs[0]->GetVector2()
);
}
void WrapActorConstraint( Vector3& position, const PropertyInputContainer& inputs )
}
void WrapActorConstraint( Vector3& position, const PropertyInputContainer& inputs )
@@
-41,8
+41,8
@@
void WrapActorConstraint( Vector3& position, const PropertyInputContainer& input
if(wrap)
{
if(wrap)
{
- const Vector
3& min = inputs[3]->GetVector3
();
- const Vector
3& max = inputs[4]->GetVector3
();
+ const Vector
2& min = inputs[3]->GetVector2
();
+ const Vector
2& max = inputs[4]->GetVector2
();
const Vector3& anchor = inputs[1]->GetVector3();
const Vector3 scale = inputs[0]->GetVector3();
const Vector3& anchor = inputs[1]->GetVector3();
const Vector3 scale = inputs[0]->GetVector3();