X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-view.cpp;h=eadaa49f7f0170897f5ac355966c05a9b55da0b6;hb=3a727ff0ae4baf350511079f016aeaadd4b0faa9;hp=08bd1ff0ff11c70301450575377ad250b0747e92;hpb=e4a430b81add6d09b02011b4eb010039563ca4f6;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp index 08bd1ff..eadaa49 100644 --- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp +++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp @@ -190,7 +190,7 @@ FixedRuler::FixedRuler(float spacing) { if(fabsf(mSpacing) <= Math::MACHINE_EPSILON_1) { - DALI_LOG_ERROR( "Page spacing too small (%f).", double(spacing) ); + DALI_LOG_ERROR( "Page spacing too small (%f).\n", double(spacing) ); mSpacing = spacing >= 0.0f ? Math::MACHINE_EPSILON_1 : -Math::MACHINE_EPSILON_1; } mType = Fixed; @@ -257,7 +257,7 @@ unsigned int FixedRuler::GetPageFromPosition(float position, bool wrap) const if(pagesPerVolume < 1u) { pagesPerVolume = 1u; - DALI_LOG_ERROR("Ruler domain(%f) is smaller than its spacing(%f).", mDomain.GetSize() * 1.0, mSpacing * 1.0 ); + DALI_LOG_ERROR("Ruler domain(%f) is smaller than its spacing(%f).\n", mDomain.GetSize() * 1.0, mSpacing * 1.0 ); } page %= pagesPerVolume; } @@ -486,14 +486,14 @@ void ScrollView::SetMaxFlickSpeed(float speed) GetImpl(*this).SetMaxFlickSpeed(speed); } -Vector2 ScrollView::GetMouseWheelScrollDistanceStep() const +Vector2 ScrollView::GetWheelScrollDistanceStep() const { - return GetImpl(*this).GetMouseWheelScrollDistanceStep(); + return GetImpl(*this).GetWheelScrollDistanceStep(); } -void ScrollView::SetMouseWheelScrollDistanceStep(Vector2 step) +void ScrollView::SetWheelScrollDistanceStep(Vector2 step) { - GetImpl(*this).SetMouseWheelScrollDistanceStep(step); + GetImpl(*this).SetWheelScrollDistanceStep(step); } Vector2 ScrollView::GetCurrentScrollPosition() const