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
Merge "Resolve cases for strikethrough when using multiple <s> tags" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
markup-processor.cpp
diff --git
a/dali-toolkit/internal/text/markup-processor.cpp
b/dali-toolkit/internal/text/markup-processor.cpp
index
68b0632
..
1671075
100644
(file)
--- a/
dali-toolkit/internal/text/markup-processor.cpp
+++ b/
dali-toolkit/internal/text/markup-processor.cpp
@@
-218,7
+218,7
@@
void Initialize(StrikethroughCharacterRun& strikethroughCharacterRun)
{
strikethroughCharacterRun.characterRun.characterIndex = 0u;
strikethroughCharacterRun.characterRun.numberOfCharacters = 0u;
- strikethroughCharacterRun.
isColorSet
= false;
+ strikethroughCharacterRun.
properties.colorDefined
= false;
}
/**