From: György Straub Date: Fri, 21 Dec 2018 10:23:04 +0000 (+0000) Subject: [dali_1.4.0] Merge branch 'devel/master' X-Git-Tag: dali_1.9.8~5^2~66 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=a69932b2e014b4f8b9cd9083d3e06340c5d9fc55;hp=7b531836b685ab75b8dc8d697f7e9d858167f9e0 [dali_1.4.0] Merge branch 'devel/master' Change-Id: Ia2703e6d0d8e736f18c13e3cdb84c4ff4504a397 --- diff --git a/build/tizen/docs/dali.doxy.in b/build/tizen/docs/dali.doxy.in index 98106dc..4fcf095 100755 --- a/build/tizen/docs/dali.doxy.in +++ b/build/tizen/docs/dali.doxy.in @@ -346,6 +346,7 @@ ALIASES += SINCE_1_0="@since 1.0" ALIASES += SINCE_1_1="@since 1.1" ALIASES += SINCE_1_2="@since 1.2" ALIASES += SINCE_1_3="@since 1.3" +ALIASES += SINCE_1_4="@since 1.4" # Extra tags for Tizen 3.0 ALIASES += SINCE_1_2_2="@since 1.2.2" @@ -367,6 +368,7 @@ ALIASES += DEPRECATED_1_2_8="@deprecated Deprecated since 1.2.8" ALIASES += DEPRECATED_1_2_10="@deprecated Deprecated since 1.2.10" ALIASES += DEPRECATED_1_2="@deprecated Deprecated since 1.2" ALIASES += DEPRECATED_1_3="@deprecated Deprecated since 1.3" +ALIASES += DEPRECATED_1_4="@deprecated Deprecated since 1.4" ALIASES += PLATFORM="" ALIASES += PRIVLEVEL_PLATFORM="" @@ -384,6 +386,7 @@ ALIASES += REMARK_RAWVIDEO="" #ALIASES += SINCE_1_1="\par Since:\n 3.0, DALi version 1.1" #ALIASES += SINCE_1_2="\par Since:\n 4.0, DALi version 1.2" #ALIASES += SINCE_1_3="\par Since:\n 5.0, DALi version 1.3" +#ALIASES += SINCE_1_4="\par Since:\n 6.0, DALi version 1.4" ## Extra tags for Tizen 3.0 #ALIASES += SINCE_1_2_2="\par Since:\n 3.0, DALi version 1.2.2" @@ -407,6 +410,7 @@ ALIASES += REMARK_RAWVIDEO="" #ALIASES += DEPRECATED_1_2_10="@deprecated Deprecated since 3.0, DALi version 1.2.10" #ALIASES += DEPRECATED_1_2="@deprecated Deprecated since 4.0, DALi version 1.2" #ALIASES += DEPRECATED_1_3="@deprecated Deprecated since 5.0, DALi version 1.3" +#ALIASES += DEPRECATED_1_4="@deprecated Deprecated since 6.0, DALi version 1.4" #ALIASES += PLATFORM="@platform" #ALIASES += PRIVLEVEL_PLATFORM="\par Privilege Level:\n platform" diff --git a/dali-toolkit/devel-api/layouting/layout-group-impl.cpp b/dali-toolkit/devel-api/layouting/layout-group-impl.cpp index a8927f9..835aa66 100644 --- a/dali-toolkit/devel-api/layouting/layout-group-impl.cpp +++ b/dali-toolkit/devel-api/layouting/layout-group-impl.cpp @@ -59,6 +59,7 @@ LayoutGroup::~LayoutGroup() { // An object with a unique_ptr to an opaque structure must define it's destructor in the translation unit // where the opaque structure is defined. It cannot use the default method in the header file. + RemoveAll(); } Toolkit::LayoutGroup::LayoutId LayoutGroup::Add( LayoutItem& child ) diff --git a/dali-toolkit/internal/text/bidirectional-support.cpp b/dali-toolkit/internal/text/bidirectional-support.cpp index 9f9bddc..26e99b7 100755 --- a/dali-toolkit/internal/text/bidirectional-support.cpp +++ b/dali-toolkit/internal/text/bidirectional-support.cpp @@ -148,7 +148,7 @@ void SetBidirectionalInfo( const Vector& text, break; } - if( !hasRightToLeftScript && TextAbstraction::IsRightToLeftScript( scriptRun.script ) ) + if( !hasRightToLeftScript && scriptRun.isRightToLeft ) { // The script is right to left. hasRightToLeftScript = true; diff --git a/dali-toolkit/internal/text/multi-language-support-impl.cpp b/dali-toolkit/internal/text/multi-language-support-impl.cpp index 4b6eee2..607d159 100755 --- a/dali-toolkit/internal/text/multi-language-support-impl.cpp +++ b/dali-toolkit/internal/text/multi-language-support-impl.cpp @@ -204,6 +204,9 @@ void MultilanguageSupport::SetScripts( const Vector& text, // Pointers to the text buffer. const Character* const textBuffer = text.Begin(); + // Initialize whether is right to left direction + currentScriptRun.isRightToLeft = false; + // Traverse all characters and set the scripts. const Length lastCharacter = startIndex + numberOfCharacters; for( Length index = startIndex; index < lastCharacter; ++index ) @@ -226,6 +229,9 @@ void MultilanguageSupport::SetScripts( const Vector& text, while( !endOfText && ( TextAbstraction::COMMON == script ) ) { + // Check if whether is right to left markup and Keeps true if the previous value was true. + currentScriptRun.isRightToLeft = currentScriptRun.isRightToLeft || TextAbstraction::IsRightToLeftMark( character ); + if( TextAbstraction::EMOJI == currentScriptRun.script ) { // Emojis doesn't mix well with characters common to all scripts. Insert the emoji run. @@ -262,6 +268,8 @@ void MultilanguageSupport::SetScripts( const Vector& text, currentScriptRun.characterRun.numberOfCharacters = 0u; currentScriptRun.script = TextAbstraction::UNKNOWN; numberOfAllScriptCharacters = 0u; + // Initialize whether is right to left direction + currentScriptRun.isRightToLeft = false; } // Get the next character. @@ -288,7 +296,7 @@ void MultilanguageSupport::SetScripts( const Vector& text, ( TextAbstraction::EMOJI != script ) ) { // Sets the direction of the first valid script. - isParagraphRTL = TextAbstraction::IsRightToLeftScript( script ); + isParagraphRTL = currentScriptRun.isRightToLeft || TextAbstraction::IsRightToLeftScript( script ); isFirstScriptToBeSet = false; } @@ -332,6 +340,8 @@ void MultilanguageSupport::SetScripts( const Vector& text, currentScriptRun.characterRun.numberOfCharacters = numberOfAllScriptCharacters + 1u; // Adds the white spaces which are at the begining of the script. currentScriptRun.script = script; numberOfAllScriptCharacters = 0u; + // Check if whether is right to left script. + currentScriptRun.isRightToLeft = TextAbstraction::IsRightToLeftScript( currentScriptRun.script ); } else { diff --git a/dali-toolkit/internal/text/script-run.h b/dali-toolkit/internal/text/script-run.h old mode 100644 new mode 100755 index 3533df6..3f6b678 --- a/dali-toolkit/internal/text/script-run.h +++ b/dali-toolkit/internal/text/script-run.h @@ -37,6 +37,7 @@ struct ScriptRun { CharacterRun characterRun; ///< The initial character index and the number of characters of the run. Script script; ///< Script of the run. + bool isRightToLeft; ///< Whether is right to left direction }; } // namespace Text diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp index 5b6ff25..f18f84e 100644 --- a/dali-toolkit/public-api/dali-toolkit-version.cpp +++ b/dali-toolkit/public-api/dali-toolkit-version.cpp @@ -30,8 +30,8 @@ namespace Toolkit { const unsigned int TOOLKIT_MAJOR_VERSION = 1; -const unsigned int TOOLKIT_MINOR_VERSION = 3; -const unsigned int TOOLKIT_MICRO_VERSION = 54; +const unsigned int TOOLKIT_MINOR_VERSION = 4; +const unsigned int TOOLKIT_MICRO_VERSION = 0; const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__; #ifdef DEBUG_ENABLED diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index 763a9e9..b320c53 100644 --- a/packaging/dali-toolkit.spec +++ b/packaging/dali-toolkit.spec @@ -1,6 +1,6 @@ Name: dali-toolkit Summary: Dali 3D engine Toolkit -Version: 1.3.54 +Version: 1.4.0 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-3-Clause and MIT