From 21ff02a69331fbcd53dc93a1af9a93618225b4bf Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Wed, 18 Feb 2015 14:35:00 -0600 Subject: 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 --- gui/image.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'gui/image.cpp') diff --git a/gui/image.cpp b/gui/image.cpp index 60b1cb956..8b43aaa34 100644 --- a/gui/image.cpp +++ b/gui/image.cpp @@ -27,9 +27,6 @@ extern "C" { GUIImage::GUIImage(xml_node<>* node) : GUIObject(node) { - xml_attribute<>* attr; - xml_node<>* child; - mImage = NULL; mHighlightImage = NULL; isHighlighted = false; @@ -37,15 +34,11 @@ GUIImage::GUIImage(xml_node<>* node) : GUIObject(node) if (!node) return; - child = node->first_node("image"); - if (child) - { - mImage = LoadAttrImage(child, "resource"); - mHighlightImage = LoadAttrImage(child, "highlightresource"); - } + mImage = LoadAttrImage(FindNode(node, "image"), "resource"); + mHighlightImage = LoadAttrImage(FindNode(node, "image"), "highlightresource"); // Load the placement - LoadPlacement(node->first_node("placement"), &mRenderX, &mRenderY, NULL, NULL, &mPlacement); + LoadPlacement(FindNode(node, "placement"), &mRenderX, &mRenderY, NULL, NULL, &mPlacement); if (mImage && mImage->GetResource()) { -- cgit v1.2.3