From f6ed8fc1f51e368bb76905d9f1d2d3735e70a644 Mon Sep 17 00:00:00 2001 From: that Date: Sat, 14 Feb 2015 20:23:16 +0100 Subject: gui: make resources type safe - add string, int, color and resource loading helpers - use typed resource classes, and some cleanup in loading code - remove abstract GetResource() to enforce type safe access - add height and width query methods to resources and use them - minor cleanup - simplify LoadPlacement Change-Id: I9b81785109a80b3806ad6b50cba4d893b87b0db1 --- gui/image.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'gui/image.cpp') diff --git a/gui/image.cpp b/gui/image.cpp index 2cf3b68af..60b1cb956 100644 --- a/gui/image.cpp +++ b/gui/image.cpp @@ -40,12 +40,8 @@ GUIImage::GUIImage(xml_node<>* node) : GUIObject(node) child = node->first_node("image"); if (child) { - attr = child->first_attribute("resource"); - if (attr) - mImage = PageManager::FindResource(attr->value()); - attr = child->first_attribute("highlightresource"); - if (attr) - mHighlightImage = PageManager::FindResource(attr->value()); + mImage = LoadAttrImage(child, "resource"); + mHighlightImage = LoadAttrImage(child, "highlightresource"); } // Load the placement @@ -53,8 +49,8 @@ GUIImage::GUIImage(xml_node<>* node) : GUIObject(node) if (mImage && mImage->GetResource()) { - mRenderW = gr_get_width(mImage->GetResource()); - mRenderH = gr_get_height(mImage->GetResource()); + mRenderW = mImage->GetWidth(); + mRenderH = mImage->GetHeight(); // Adjust for placement if (mPlacement != TOP_LEFT && mPlacement != BOTTOM_LEFT) @@ -73,8 +69,6 @@ GUIImage::GUIImage(xml_node<>* node) : GUIObject(node) } SetPlacement(TOP_LEFT); } - - return; } int GUIImage::Render(void) -- cgit v1.2.3