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/mousecursor.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'gui/mousecursor.cpp') diff --git a/gui/mousecursor.cpp b/gui/mousecursor.cpp index 1c22356f9..625588629 100644 --- a/gui/mousecursor.cpp +++ b/gui/mousecursor.cpp @@ -58,19 +58,12 @@ void MouseCursor::LoadData(xml_node<>* node) child = node->first_node("background"); if(child) { - attr = child->first_attribute("color"); - if(attr) - ConvertStrToColor(attr->value(), &m_color); - - attr = child->first_attribute("resource"); - if(attr) + m_color = LoadAttrColor(child, "color", m_color); + m_image = LoadAttrImage(child, "resource"); + if(m_image) { - m_image = PageManager::FindResource(attr->value()); - if(m_image) - { - mRenderW = gr_get_width(m_image->GetResource()); - mRenderH = gr_get_height(m_image->GetResource()); - } + mRenderW = m_image->GetWidth(); + mRenderH = m_image->GetHeight(); } } -- cgit v1.2.3