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
[dali-toolkit] fix set max character length when text already set
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-controller-text-updater.cpp
diff --git
a/dali-toolkit/internal/text/text-controller-text-updater.cpp
b/dali-toolkit/internal/text/text-controller-text-updater.cpp
index
6fb472e
..
672fd8a
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller-text-updater.cpp
+++ b/
dali-toolkit/internal/text/text-controller-text-updater.cpp
@@
-253,7
+253,8
@@
void Controller::TextUpdater::InsertText(Controller& controller, const std::stri
const Length numberOfCharactersInModel = logicalModel->mText.Count();
// Restrict new text to fit within Maximum characters setting.
const Length numberOfCharactersInModel = logicalModel->mText.Count();
// Restrict new text to fit within Maximum characters setting.
- Length maxSizeOfNewText = std::min((impl.mMaximumNumberOfCharacters - numberOfCharactersInModel), characterCount);
+ Length temp_length = (impl.mMaximumNumberOfCharacters > numberOfCharactersInModel ? impl.mMaximumNumberOfCharacters - numberOfCharactersInModel : 0);
+ Length maxSizeOfNewText = std::min(temp_length, characterCount);
maxLengthReached = (characterCount > maxSizeOfNewText);
// The cursor position.
maxLengthReached = (characterCount > maxSizeOfNewText);
// The cursor position.