From 8f97553fd7c63e1ae1625d560675201acf92c380 Mon Sep 17 00:00:00 2001
From: Paul Wisbey
Date: Fri, 22 May 2015 14:51:58 +0100
Subject: [PATCH] Avoid overwriting TEXT with PLACEHOLDER_TEXT
Change-Id: I679d9a8a1ea72d28f45897accc8c3051b85e938b
---
dali-toolkit/internal/text/text-controller.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp
index 6400370..adf4e75 100644
--- a/dali-toolkit/internal/text/text-controller.cpp
+++ b/dali-toolkit/internal/text/text-controller.cpp
@@ -160,7 +160,12 @@ void Controller::SetPlaceholderText( PlaceholderType type, const std::string& te
mImpl->mEventData->mPlaceholderTextActive = text;
}
- ShowPlaceholderText();
+ // Update placeholder if there is no text
+ if( mImpl->IsShowingPlaceholderText() ||
+ 0u == mImpl->mLogicalModel->mText.Count() )
+ {
+ ShowPlaceholderText();
+ }
}
}
--
2.7.4