X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscroll-bar%2Fscroll-bar-impl.cpp;h=93773e9ed9269d4afa83e123b299fb92ec0ea647;hp=1fef71b5041052964f39695c658d9b7b78fa9545;hb=9c1f4310db72879676b5aca2875fbf67b97a4b0a;hpb=8eb657e8cc2c66a09b45aab293a983459b396b33 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 1fef71b..93773e9 100644 --- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp +++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp @@ -213,8 +213,7 @@ void ScrollBar::OnInitialize() Self().SetProperty(Actor::Property::DRAW_MODE, DrawMode::OVERLAY_2D); DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) { - return std::unique_ptr( - new AccessibleImpl(actor, Dali::Accessibility::Role::SCROLL_BAR)); + return std::make_unique(actor, Dali::Accessibility::Role::SCROLL_BAR); }); } @@ -861,28 +860,28 @@ Toolkit::ScrollBar ScrollBar::New(Toolkit::ScrollBar::Direction direction) return handle; } -double ScrollBar::AccessibleImpl::GetMinimum() const +double ScrollBar::ScrollBarAccessible::GetMinimum() const { auto self = Toolkit::ScrollBar::DownCast(Self()); Handle scrollableHandle = GetImpl(self).mScrollableObject.GetHandle(); return scrollableHandle ? scrollableHandle.GetCurrentProperty(GetImpl(self).mPropertyMinScrollPosition) : 0.0f; } -double ScrollBar::AccessibleImpl::GetCurrent() const +double ScrollBar::ScrollBarAccessible::GetCurrent() const { auto self = Toolkit::ScrollBar::DownCast(Self()); Handle scrollableHandle = GetImpl(self).mScrollableObject.GetHandle(); return scrollableHandle ? scrollableHandle.GetCurrentProperty(GetImpl(self).mPropertyScrollPosition) : 0.0f; } -double ScrollBar::AccessibleImpl::GetMaximum() const +double ScrollBar::ScrollBarAccessible::GetMaximum() const { auto self = Toolkit::ScrollBar::DownCast(Self()); Handle scrollableHandle = GetImpl(self).mScrollableObject.GetHandle(); return scrollableHandle ? scrollableHandle.GetCurrentProperty(GetImpl(self).mPropertyMaxScrollPosition) : 1.0f; } -bool ScrollBar::AccessibleImpl::SetCurrent(double current) +bool ScrollBar::ScrollBarAccessible::SetCurrent(double current) { if(current < GetMinimum() || current > GetMaximum()) { @@ -910,7 +909,7 @@ bool ScrollBar::AccessibleImpl::SetCurrent(double current) return true; } -double ScrollBar::AccessibleImpl::GetMinimumIncrement() const +double ScrollBar::ScrollBarAccessible::GetMinimumIncrement() const { return 1.0; }