From: Adeel Kazmi Date: Fri, 10 Mar 2023 10:54:42 +0000 (+0000) Subject: Merge "Coverity issue fixes" into devel/master X-Git-Tag: dali_2.2.18~5 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=58eb86326bc3d945a3f77a72845733e0441f371a;hp=b1c649bffde8fed304e201c2b1aab60c8e5c6028 Merge "Coverity issue fixes" into devel/master --- 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 14d2de7..fad19cf 100644 --- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp @@ -1195,7 +1195,7 @@ void TextLabel::ScrollingFinished() // Pure Virtual from TextScroller Interface DALI_LOG_INFO(gLogFilter, Debug::General, "TextLabel::ScrollingFinished\n"); - if(mController->IsAutoScrollEnabled() || mLastAutoScrollEnabled) + if(mController->IsAutoScrollEnabled() || !mController->IsMultiLineEnabled()) { mController->SetAutoScrollEnabled(false); RequestTextRelayout(); diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp index 15c7b41..7bc6ec0 100644 --- a/dali-toolkit/public-api/dali-toolkit-version.cpp +++ b/dali-toolkit/public-api/dali-toolkit-version.cpp @@ -29,7 +29,7 @@ namespace Toolkit { const unsigned int TOOLKIT_MAJOR_VERSION = 2; const unsigned int TOOLKIT_MINOR_VERSION = 2; -const unsigned int TOOLKIT_MICRO_VERSION = 16; +const unsigned int TOOLKIT_MICRO_VERSION = 17; const char* const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__; #ifdef DEBUG_ENABLED diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index fb285c7..1bba007 100644 --- a/packaging/dali-toolkit.spec +++ b/packaging/dali-toolkit.spec @@ -1,6 +1,6 @@ Name: dali2-toolkit Summary: Dali 3D engine Toolkit -Version: 2.2.16 +Version: 2.2.17 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-3-Clause and MIT