PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gui: fix default styles if object type is in element name

Browse Source 
Change-Id: I4bc46d1772fee2ec77d95732fa3f69c267c2c34e
This commit is contained in:
that
2015-11-04 21:46:01 +01:00
committed by Dees Troy
parent 35f17402e4
commit 54e9c839bc
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gui/pages.cpp
View File

@@ -137,20 +137,20 @@ xml_node<>* FindNode(xml_node<>* parent, const char* nodename, int depth /* = 0
style = style->next_sibling("style");
}
} else {
// Search for stylename in the parent node <object type="foo" stylename="foo2">
// Search for stylename in the parent node <object type="foo" style="foo2">
xml_attribute<>* attr = parent->first_attribute("style");
// If no style is found anywhere else and the node wasn't found in the object itself
// as a special case we will search for a style that uses the same style name as the
// object type, so <object type="button"> would search for a style named "button"
if (!attr)
attr = parent->first_attribute("type");
if (attr) {
xml_node<>* node = PageManager::FindStyle(attr->value());
if (node) {
xml_node<>* stylenode = FindNode(node, nodename, depth + 1);
if (stylenode)
return stylenode;
}
// if there's no attribute type, the object type must be the element name
std::string stylename = attr ? attr->value() : parent->name();
xml_node<>* node = PageManager::FindStyle(stylename);
if (node) {
xml_node<>* stylenode = FindNode(node, nodename, depth + 1);
if (stylenode)
return stylenode;
}
}
return NULL;