projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Shortcut check for markup in a string, before attempting to parse and split the strin...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-input
/
text-input-impl.cpp
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
(file)
--- 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 ),
mSelectTextOnCommit( false ),
mUnderlinedPriorToPreEdit ( false ),
mCommitByKeyInput( false ),
- mPlaceHolderSet( false )
+ mPlaceHolderSet( false ),
+ mMarkUpEnabled( false )
{
// Updates the line height accordingly with the input style.
UpdateLineHeight();
{
// 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.
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() )
{
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() );
{
DALI_LOG_INFO(gLogFilter, Debug::General, "SetText string[%s]\n", initialText.c_str() );
- GetStyledTextArray( initialText, mStyledText );
+ GetStyledTextArray( initialText, mStyledText
, IsMarkupProcessingEnabled()
);
if( mStyledText.empty() )
{
if( mStyledText.empty() )
{
@@
-4859,6
+4860,16
@@
bool TextInput::IsSnapshotModeEnabled() const
return snapshotEnabled;
}
return snapshotEnabled;
}
+void TextInput::SetMarkupProcessingEnabled( bool enable )
+{
+ mMarkUpEnabled = enable;
+}
+
+bool TextInput::IsMarkupProcessingEnabled() const
+{
+ return mMarkUpEnabled;
+}
+
void TextInput::SetScrollEnabled( bool enable )
{
if( mDisplayedTextView )
void TextInput::SetScrollEnabled( bool enable )
{
if( mDisplayedTextView )