From: Bowon Ryu <bowon.ryu@samsung.com>
Date: Tue, 29 Jun 2021 02:14:11 +0000 (+0000)
Subject: Merge "Add InputFilter to TextField, TextEditor" into devel/master
X-Git-Tag: dali_2.0.33~5
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=e172c89c895d46d430b2cf0a0dbceeea0ae09b29;hp=-c

Merge "Add InputFilter to TextField, TextEditor" into devel/master
---

e172c89c895d46d430b2cf0a0dbceeea0ae09b29
diff --combined dali-toolkit/internal/file.list
index 41d9978,01dc60f..9cab1a6
--- a/dali-toolkit/internal/file.list
+++ b/dali-toolkit/internal/file.list
@@@ -137,10 -137,10 +137,11 @@@ SET( toolkit_src_file
     ${toolkit_src_dir}/text/markup-processor-anchor.cpp
     ${toolkit_src_dir}/text/markup-processor-font.cpp
     ${toolkit_src_dir}/text/markup-processor-background.cpp
 +   ${toolkit_src_dir}/text/markup-processor-span.cpp
     ${toolkit_src_dir}/text/markup-processor-helper-functions.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/property-string-parser.cpp
     ${toolkit_src_dir}/text/segmentation.cpp
     ${toolkit_src_dir}/text/shaper.cpp