From 0cdb6b8ce5b68d39841d2d25a2bccb8687d6ae8f Mon Sep 17 00:00:00 2001 From: Eunki Hong Date: Fri, 27 Jan 2023 23:21:24 +0900 Subject: [PATCH] Remove useless warning message when multiline TextLabel SceneOff When TextLabel is not single line, ScrollFinished callback called always. And if layout is not a singline line, yellow message printed. This patch try to remove that annoying useless message. Change-Id: I6f76af40d797632ccaa0b9bba5827dcc41c7ea50 Signed-off-by: Eunki Hong --- dali-toolkit/internal/controls/text-controls/text-label-impl.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp index 4f4503b..8d3c203 100644 --- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp @@ -1194,8 +1194,12 @@ void TextLabel::ScrollingFinished() { // Pure Virtual from TextScroller Interface DALI_LOG_INFO(gLogFilter, Debug::General, "TextLabel::ScrollingFinished\n"); - mController->SetAutoScrollEnabled(false); - RequestTextRelayout(); + + if(mController->IsAutoScrollEnabled() || mLastAutoScrollEnabled) + { + mController->SetAutoScrollEnabled(false); + RequestTextRelayout(); + } } void TextLabel::OnLayoutDirectionChanged(Actor actor, LayoutDirection::Type type) -- 2.7.4