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
Fix for application crashing
[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
69daef1
..
88bd454
100644
(file)
--- a/
dali-toolkit/internal/controls/text-input/text-input-impl.cpp
+++ b/
dali-toolkit/internal/controls/text-input/text-input-impl.cpp
@@
-327,7
+327,7
@@
TextInput::TextInput()
mUnderlinedPriorToPreEdit ( false ),
mCommitByKeyInput( false ),
mPlaceHolderSet( false ),
mUnderlinedPriorToPreEdit ( false ),
mCommitByKeyInput( false ),
mPlaceHolderSet( false ),
- mMarkUpEnabled(
fals
e )
+ mMarkUpEnabled(
tru
e )
{
// Updates the line height accordingly with the input style.
UpdateLineHeight();
{
// Updates the line height accordingly with the input style.
UpdateLineHeight();
@@
-846,7
+846,6
@@
TextStyle TextInput::GetStyleAtCursor() const
if ( !mStyledText.empty() && ( mCursorPosition > 0 ) )
{
DALI_ASSERT_DEBUG( ( 0 <= mCursorPosition-1 ) && ( mCursorPosition-1 < mStyledText.size() ) );
if ( !mStyledText.empty() && ( mCursorPosition > 0 ) )
{
DALI_ASSERT_DEBUG( ( 0 <= mCursorPosition-1 ) && ( mCursorPosition-1 < mStyledText.size() ) );
-
style = mStyledText.at( mCursorPosition-1 ).mStyle;
}
else // No text.
style = mStyledText.at( mCursorPosition-1 ).mStyle;
}
else // No text.
@@
-2029,6
+2028,7
@@
void TextInput::SetUpTouchEvents()
void TextInput::CreateTextViewActor()
{
mDisplayedTextView = Toolkit::TextView::New();
void TextInput::CreateTextViewActor()
{
mDisplayedTextView = Toolkit::TextView::New();
+ mDisplayedTextView.SetMarkupProcessingEnabled( mMarkUpEnabled );
mDisplayedTextView.SetParentOrigin(ParentOrigin::TOP_LEFT);
mDisplayedTextView.SetAnchorPoint(AnchorPoint::TOP_LEFT);
mDisplayedTextView.SetMultilinePolicy(Toolkit::TextView::SplitByWord);
mDisplayedTextView.SetParentOrigin(ParentOrigin::TOP_LEFT);
mDisplayedTextView.SetAnchorPoint(AnchorPoint::TOP_LEFT);
mDisplayedTextView.SetMultilinePolicy(Toolkit::TextView::SplitByWord);