Merge "DALi Version 2.0.21" into devel/master

[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 4701d6c..fcf0b91 100644 (file)
--- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
+++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
@@ -31,6 +31,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/asset-manager/asset-manager.h>
+#include <dali-toolkit/internal/controls/control/control-data-impl.h>
 #include <dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h>
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
 
@@ -862,21 +863,21 @@ Toolkit::ScrollBar ScrollBar::New(Toolkit::ScrollBar::Direction direction)
 
 double ScrollBar::AccessibleImpl::GetMinimum()
 {
-  auto   p                = Toolkit::ScrollBar::DownCast(self);
+  auto   p                = Toolkit::ScrollBar::DownCast(Self());
   Handle scrollableHandle = GetImpl(p).mScrollableObject.GetHandle();
   return scrollableHandle ? scrollableHandle.GetCurrentProperty<float>(GetImpl(p).mPropertyMinScrollPosition) : 0.0f;
 }
 
 double ScrollBar::AccessibleImpl::GetCurrent()
 {
-  auto   p                = Toolkit::ScrollBar::DownCast(self);
+  auto   p                = Toolkit::ScrollBar::DownCast(Self());
   Handle scrollableHandle = GetImpl(p).mScrollableObject.GetHandle();
   return scrollableHandle ? scrollableHandle.GetCurrentProperty<float>(GetImpl(p).mPropertyScrollPosition) : 0.0f;
 }
 
 double ScrollBar::AccessibleImpl::GetMaximum()
 {
-  auto   p                = Toolkit::ScrollBar::DownCast(self);
+  auto   p                = Toolkit::ScrollBar::DownCast(Self());
   Handle scrollableHandle = GetImpl(p).mScrollableObject.GetHandle();
   return scrollableHandle ? scrollableHandle.GetCurrentProperty<float>(GetImpl(p).mPropertyMaxScrollPosition) : 1.0f;
 }
@@ -888,7 +889,7 @@ bool ScrollBar::AccessibleImpl::SetCurrent(double current)
 
   auto value_before = GetCurrent();
 
-  auto   p                = Toolkit::ScrollBar::DownCast(self);
+  auto   p                = Toolkit::ScrollBar::DownCast(Self());
   Handle scrollableHandle = GetImpl(p).mScrollableObject.GetHandle();
   if(!scrollableHandle)
     return false;