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
Further Setter/Getter public API removal from Dali::Actor
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
scroll-bar
/
scroll-bar-impl.cpp
diff --git
a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
index
74b5b62
..
683cfd6
100755
(executable)
--- a/
dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
+++ b/
dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
@@
-307,7
+307,7
@@
void ScrollBar::ApplyConstraints()
// Set indicator height according to the indicator's height policy
if(mIndicatorHeightPolicy == Toolkit::ScrollBar::Fixed)
{
// Set indicator height according to the indicator's height policy
if(mIndicatorHeightPolicy == Toolkit::ScrollBar::Fixed)
{
- mIndicator.Set
Size(Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width, mIndicatorFixedHeight
);
+ mIndicator.Set
Property( Actor::Property::SIZE, Vector2( Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width, mIndicatorFixedHeight)
);
}
else
{
}
else
{
@@
-532,7
+532,7
@@
void ScrollBar::OnSizeSet( const Vector3& size )
{
if(mIndicatorHeightPolicy == Toolkit::ScrollBar::Fixed)
{
{
if(mIndicatorHeightPolicy == Toolkit::ScrollBar::Fixed)
{
- mIndicator.Set
Size(size.width, mIndicatorFixedHeight
);
+ mIndicator.Set
Property( Actor::Property::SIZE, Vector2( size.width, mIndicatorFixedHeight )
);
}
Control::OnSizeSet( size );
}
Control::OnSizeSet( size );
@@
-568,7
+568,7
@@
void ScrollBar::SetIndicatorFixedHeight( float height )
if(mIndicatorHeightPolicy == Toolkit::ScrollBar::Fixed)
{
if(mIndicatorHeightPolicy == Toolkit::ScrollBar::Fixed)
{
- mIndicator.Set
Size(Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width, mIndicatorFixedHeight
);
+ mIndicator.Set
Property( Actor::Property::SIZE, Vector2( Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width, mIndicatorFixedHeight)
);
}
}
}
}