X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-input%2Ftext-input-impl.cpp;h=69daef19bd8fa3d5b3961e120a3a9c2773153b92;hb=refs%2Fchanges%2F50%2F19450%2F1;hp=2801042bd6c6b8732d107b951db5dca9b607e5ae;hpb=cf2dd988cd7f7154208f1ffe9257f81df698cee6;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/text-input/text-input-impl.cpp b/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
index 2801042..69daef1 100644
--- a/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
+++ b/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
@@ -326,7 +326,8 @@ TextInput::TextInput()
  mSelectTextOnCommit( false ),
  mUnderlinedPriorToPreEdit ( false ),
  mCommitByKeyInput( false ),
- mPlaceHolderSet( false )
+ mPlaceHolderSet( false ),
+ mMarkUpEnabled( false )
 {
   // Updates the line height accordingly with the input style.
   UpdateLineHeight();
@@ -364,7 +365,7 @@ std::string TextInput::GetMarkupText() const
 void TextInput::SetPlaceholderText( const std::string& placeHolderText )
 {
   // Get the placeholder styled text array from the markup string.
-  MarkupProcessor::GetStyledTextArray( placeHolderText, mStyledPlaceHolderText );
+  MarkupProcessor::GetStyledTextArray( placeHolderText, mStyledPlaceHolderText, IsMarkupProcessingEnabled() );
 
   if( mStyledText.empty() )
   {
@@ -406,7 +407,7 @@ void TextInput::SetText(const std::string& initialText)
 {
   DALI_LOG_INFO(gLogFilter, Debug::General, "SetText string[%s]\n", initialText.c_str() );
 
-  GetStyledTextArray( initialText, mStyledText );
+  GetStyledTextArray( initialText, mStyledText, IsMarkupProcessingEnabled() );
 
   if( mStyledText.empty() )
   {
@@ -4859,6 +4860,16 @@ bool TextInput::IsSnapshotModeEnabled() const
   return snapshotEnabled;
 }
 
+void TextInput::SetMarkupProcessingEnabled( bool enable )
+{
+  mMarkUpEnabled = enable;
+}
+
+bool TextInput::IsMarkupProcessingEnabled() const
+{
+  return mMarkUpEnabled;
+}
+
 void TextInput::SetScrollEnabled( bool enable )
 {
   if( mDisplayedTextView )