From 266dbd296834e8fc8723c9c3f3e62a9abd94bcdd Mon Sep 17 00:00:00 2001 From: Victor Cebollada Date: Wed, 14 May 2014 15:12:05 +0100 Subject: [PATCH] TextInput - Disable markup processor [problem] Strings like are interpreted and not shown. [cause] markup processor is enabled. [solution] disable markup processor. Change-Id: Ibe0e6ab5e9b5cbd600eb34120a1bbf10ab072899 Signed-off-by: Victor Cebollada --- .../internal/controls/text-input/text-input-impl.cpp | 2 +- .../public-api/markup-processor/markup-processor.cpp | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp b/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp index 88bd454..5ce0daf 100644 --- a/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp +++ b/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp @@ -327,7 +327,7 @@ TextInput::TextInput() mUnderlinedPriorToPreEdit ( false ), mCommitByKeyInput( false ), mPlaceHolderSet( false ), - mMarkUpEnabled( true ) + mMarkUpEnabled( false ) { // Updates the line height accordingly with the input style. UpdateLineHeight(); diff --git a/base/dali-toolkit/public-api/markup-processor/markup-processor.cpp b/base/dali-toolkit/public-api/markup-processor/markup-processor.cpp index 995253a..f26a04b 100644 --- a/base/dali-toolkit/public-api/markup-processor/markup-processor.cpp +++ b/base/dali-toolkit/public-api/markup-processor/markup-processor.cpp @@ -548,7 +548,18 @@ void GetStyledTextArray( const std::string& markupString, StyledTextArray& style if ( !scanForMarkup ) { - styledTextArray.push_back( StyledText( Text( markupString ), TextStyle() ) ); + const Text text( markupString ); + const std::size_t size = text.GetLength(); + + styledTextArray.resize( size, StyledText( Text(), TextStyle() ) ); + + std::size_t index = 0; + for( StyledTextArray::iterator it = styledTextArray.begin(), endIt = styledTextArray.end(); it != endIt; ++it, ++index ) + { + StyledText& styledText( *it ); + + styledText.mText.Append( text[index] ); + } return; } -- 2.7.4