projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
65b846c
)
Avoid overwriting TEXT with PLACEHOLDER_TEXT
97/39797/2
author
Paul Wisbey
<p.wisbey@samsung.com>
Fri, 22 May 2015 13:51:58 +0000
(14:51 +0100)
committer
Paul Wisbey
<p.wisbey@samsung.com>
Fri, 22 May 2015 13:57:01 +0000
(14:57 +0100)
Change-Id: I679d9a8a1ea72d28f45897accc8c3051b85e938b
dali-toolkit/internal/text/text-controller.cpp
patch
|
blob
|
history
diff --git
a/dali-toolkit/internal/text/text-controller.cpp
b/dali-toolkit/internal/text/text-controller.cpp
index 64003704f151fd6d5bde29ad2eb81e158c91e5fa..adf4e75f11ceef1068266a344cbe9b6916dca9d6 100644
(file)
--- 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();
+ }
}
}