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
diff --git a/gui/console.cpp b/gui/console.cpp
index bb70400..3623f55 100644
--- a/gui/console.cpp
+++ b/gui/console.cpp
@@ -101,7 +101,6 @@
GUIConsole::GUIConsole(xml_node<>* node) : GUIObject(node)
{
- xml_attribute<>* attr;
xml_node<>* child;
mFont = NULL;
@@ -126,13 +125,9 @@
}
else
{
- child = node->first_node("font");
- if (child)
- {
- mFont = LoadAttrFont(child, "resource");
- }
+ mFont = LoadAttrFont(FindNode(node, "font"), "resource");
- child = node->first_node("color");
+ child = FindNode(node, "color");
if (child)
{
mForegroundColor = LoadAttrColor(child, "foreground", mForegroundColor);
@@ -141,9 +136,9 @@
}
// Load the placement
- LoadPlacement(node->first_node("placement"), &mConsoleX, &mConsoleY, &mConsoleW, &mConsoleH);
+ LoadPlacement(FindNode(node, "placement"), &mConsoleX, &mConsoleY, &mConsoleW, &mConsoleH);
- child = node->first_node("slideout");
+ child = FindNode(node, "slideout");
if (child)
{
mSlideout = 1;