Merge "Refactoring related-runs for the mutable-markup (Spannable)" into devel/master
authorBowon Ryu <bowon.ryu@samsung.com>
Tue, 31 May 2022 10:55:22 +0000 (10:55 +0000)
committerGerrit Code Review <gerrit@review>
Tue, 31 May 2022 10:55:22 +0000 (10:55 +0000)
1  2 
automated-tests/src/dali-toolkit-internal/CMakeLists.txt
dali-toolkit/internal/file.list

@@@ -16,9 -16,9 +16,10 @@@ SET(TC_SOURCE
   utc-Dali-Dictionary.cpp
   utc-Dali-FeedbackStyle.cpp
   utc-Dali-ItemView-internal.cpp
 + utc-Dali-LineHelperFunctions.cpp
   utc-Dali-LogicalModel.cpp
   utc-Dali-PropertyHelper.cpp
+  utc-Dali-Text-AbstractStyleCharacterRun.cpp
   utc-Dali-Text-Characters.cpp
   utc-Dali-Text-CharacterSetConversion.cpp
   utc-Dali-Text-Circular.cpp
@@@ -139,6 -139,7 +139,7 @@@ SET( toolkit_src_file
     ${toolkit_src_dir}/image-loader/image-load-thread.cpp
     ${toolkit_src_dir}/image-loader/image-url-impl.cpp
     ${toolkit_src_dir}/styling/style-manager-impl.cpp
+    ${toolkit_src_dir}/text/abstract-style-character-run.cpp
     ${toolkit_src_dir}/text/bidirectional-support.cpp
     ${toolkit_src_dir}/text/bounded-paragraph-helper-functions.cpp
     ${toolkit_src_dir}/text/character-set-conversion.cpp
     ${toolkit_src_dir}/text/multi-language-support.cpp
     ${toolkit_src_dir}/text/hidden-text.cpp
     ${toolkit_src_dir}/text/input-filter.cpp
 +   ${toolkit_src_dir}/text/line-helper-functions.cpp
     ${toolkit_src_dir}/text/property-string-parser.cpp
     ${toolkit_src_dir}/text/segmentation.cpp
     ${toolkit_src_dir}/text/shaper.cpp