GUI: Support styles in xml to reduce xml file size

Also allow sliders to have their own text label instead of
requiring a whole separate text object for the label in the xml.

Change-Id: I6e314efb4bb454d496555ff7e003d743063a1308
This commit is contained in:
Ethan Yonker
2015-02-21 08:14:24 -06:00
parent 10ec0175c8
commit 21ff02a693
25 changed files with 1055 additions and 2977 deletions
+4 -4
View File
@@ -226,9 +226,9 @@ GUIAction::GUIAction(xml_node<>* node)
}
// First, get the action
actions = node->first_node("actions");
if (actions) child = actions->first_node("action");
else child = node->first_node("action");
actions = FindNode(node, "actions");
if (actions) child = FindNode(actions, "action");
else child = FindNode(node, "action");
if (!child) return;
@@ -247,7 +247,7 @@ GUIAction::GUIAction(xml_node<>* node)
}
// Now, let's get either the key or region
child = node->first_node("touch");
child = FindNode(node, "touch");
if (child)
{
attr = child->first_attribute("key");