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 "[AT-SPI] Notify parent Accessible when ACCESSIBILITY_HIDDEN is set" into devel...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
markup-processor-color.cpp
diff --git
a/dali-toolkit/internal/text/markup-processor-color.cpp
b/dali-toolkit/internal/text/markup-processor-color.cpp
index
b66e37a
..
d5fce04
100644
(file)
--- a/
dali-toolkit/internal/text/markup-processor-color.cpp
+++ b/
dali-toolkit/internal/text/markup-processor-color.cpp
@@
-36,6
+36,11
@@
namespace
const std::string XHTML_VALUE_ATTRIBUTE("value");
}
const std::string XHTML_VALUE_ATTRIBUTE("value");
}
+void ProcessColor(const Attribute& attribute, ColorRun& colorRun)
+{
+ ColorStringToVector4(attribute.valueBuffer, attribute.valueLength, colorRun.color);
+}
+
void ProcessColorTag(const Tag& tag, ColorRun& colorRun)
{
for(Vector<Attribute>::ConstIterator it = tag.attributes.Begin(),
void ProcessColorTag(const Tag& tag, ColorRun& colorRun)
{
for(Vector<Attribute>::ConstIterator it = tag.attributes.Begin(),
@@
-46,7
+51,7
@@
void ProcessColorTag(const Tag& tag, ColorRun& colorRun)
const Attribute& attribute(*it);
if(TokenComparison(XHTML_VALUE_ATTRIBUTE, attribute.nameBuffer, attribute.nameLength))
{
const Attribute& attribute(*it);
if(TokenComparison(XHTML_VALUE_ATTRIBUTE, attribute.nameBuffer, attribute.nameLength))
{
-
ColorStringToVector4(attribute.valueBuffer, attribute.valueLength, colorRun.color
);
+
ProcessColor(attribute, colorRun
);
}
}
}
}
}
}