From fbab2277a4fcec98f071ecf7334894d79912af52 Mon Sep 17 00:00:00 2001
From: Paul Wisbey
Date: Tue, 16 Jun 2015 18:28:18 +0100
Subject: [PATCH] Fixed deletion of last character with no place-holder text
Change-Id: I3974b9118b990615b4b90874a1f8257de1f7cc36
---
dali-toolkit/internal/text/text-controller.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp
index 589a018..23ade2b 100644
--- a/dali-toolkit/internal/text/text-controller.cpp
+++ b/dali-toolkit/internal/text/text-controller.cpp
@@ -1143,14 +1143,15 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent )
if( removed )
{
- if( 0u == mImpl->mLogicalModel->mText.Count() )
+ if( 0u != mImpl->mLogicalModel->mText.Count() ||
+ !mImpl->IsPlaceholderAvailable() )
{
- ShowPlaceholderText();
- mImpl->mEventData->mUpdateCursorPosition = true;
+ mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED );
}
else
{
- mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED );
+ ShowPlaceholderText();
+ mImpl->mEventData->mUpdateCursorPosition = true;
}
textChanged = true;
--
2.7.4