From a2e1acddad383872acce39c915b625f9f8ee7786 Mon Sep 17 00:00:00 2001 From: "joogab.yun" Date: Thu, 27 Jun 2024 17:58:44 +0900 Subject: [PATCH] [Tizen] Fix calculation of whether to scroll. Change-Id: Id5ce3f23f7caaac8b8a2480b70113d5db25b674b --- .../internal/text/controller/text-controller-impl.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dali-toolkit/internal/text/controller/text-controller-impl.cpp b/dali-toolkit/internal/text/controller/text-controller-impl.cpp index 10a76f1..0fd1ea0 100644 --- a/dali-toolkit/internal/text/controller/text-controller-impl.cpp +++ b/dali-toolkit/internal/text/controller/text-controller-impl.cpp @@ -1677,12 +1677,11 @@ bool Controller::Impl::IsScrollable(const Vector2& displacement) { const Vector2& targetSize = mModel->mVisualModel->mControlSize; const Vector2& layoutSize = mModel->mVisualModel->GetLayoutSize(); - const Vector2& scrollPosition = mModel->mScrollPosition; if(isHorizontalScrollEnabled) { - const float displacementX = displacement.x; - const float positionX = scrollPosition.x + displacementX; + const float scrollPositionX = std::max(mModel->mScrollPosition.x, -(layoutSize.width - targetSize.width)); + const float positionX = scrollPositionX + displacement.x; if(layoutSize.width > targetSize.width && -positionX > 0.f && -positionX < layoutSize.width - targetSize.width) { isScrollable = true; @@ -1691,9 +1690,9 @@ bool Controller::Impl::IsScrollable(const Vector2& displacement) if(isVerticalScrollEnabled) { - const float displacementY = displacement.y; - const float positionY = scrollPosition.y + displacementY; - if(layoutSize.height > targetSize.height && -positionY > 0 && -positionY < layoutSize.height - targetSize.height) + const float scrollPositionY = std::max(mModel->mScrollPosition.y, -(layoutSize.height - targetSize.height)); + const float positionY = scrollPositionY + displacement.y; + if(layoutSize.height > targetSize.height && -positionY > 0.f && -positionY < layoutSize.height - targetSize.height) { isScrollable = true; } -- 2.7.4