From: Paul Wisbey
Date: Fri, 22 May 2015 13:51:58 +0000 (+0100)
Subject: Avoid overwriting TEXT with PLACEHOLDER_TEXT
X-Git-Tag: accepted/tizen/common/20150529.134100~15^2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=8f97553fd7c63e1ae1625d560675201acf92c380
Avoid overwriting TEXT with PLACEHOLDER_TEXT
Change-Id: I679d9a8a1ea72d28f45897accc8c3051b85e938b
---
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();
+ }
}
}