projects
/
platform
/
framework
/
native
/
uifw.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9bd8451
)
fix TextObject lockup issue(N_SE-33073 N_SE-33127 N_SE-33135 N_SE-33136)
author
Sungyeon Woo
<s.woo@samsung.com>
Mon, 8 Apr 2013 14:51:19 +0000
(23:51 +0900)
committer
Sungyeon Woo
<s.woo@samsung.com>
Mon, 8 Apr 2013 14:51:19 +0000
(23:51 +0900)
Change-Id: I283f47a9c7ff27223fd26ac31bdb7d09069529a7
Signed-off-by: Sungyeon Woo <s.woo@samsung.com>
src/graphics/text/FGrp_TextTextComposite.cpp
patch
|
blob
|
history
diff --git
a/src/graphics/text/FGrp_TextTextComposite.cpp
b/src/graphics/text/FGrp_TextTextComposite.cpp
index
0ad7a58
..
3cc4907
100644
(file)
--- a/
src/graphics/text/FGrp_TextTextComposite.cpp
+++ b/
src/graphics/text/FGrp_TextTextComposite.cpp
@@
-205,6
+205,11
@@
TextComposite::ForwardAnalyze(int startTextIndex, int textLength, float maxWidth
ret = pTextElement->ForwardAnalyze(textIndexFromElementOffset, currentLength, remainingWidth,
wrap, textCount, textSize.width, textSize.height);
+ if (textSize.width == 0 && textCount == 0)
+ {
+ break;
+ }
+
textSize.height += __lineSpacing;
remainingWidth -= textSize.width;
remainingLength -= textCount;