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
Users can implement focus movement by SetCustomAlgorithm.
[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
2fd826d
..
d5fce04
100644
(file)
--- a/
dali-toolkit/internal/text/markup-processor-color.cpp
+++ b/
dali-toolkit/internal/text/markup-processor-color.cpp
@@
-27,29
+27,31
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Text
{
namespace Text
{
-
namespace
{
const std::string XHTML_VALUE_ATTRIBUTE("value");
}
namespace
{
const std::string XHTML_VALUE_ATTRIBUTE("value");
}
-void ProcessColorTag( const Tag& tag, ColorRun& colorRun )
+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(),
- endIt = tag.attributes.End();
-
it != endIt;
-
++it
)
+ for(
Vector<Attribute>::ConstIterator it
= tag.attributes.Begin(),
+
endIt = tag.attributes.End();
+ it != endIt;
+
++it
)
{
{
- 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
);
}
}
}
}
}
}