PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gui: make resources type safe

Browse Source 
- 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
This commit is contained in:
that
2015-02-14 20:23:16 +01:00
parent cfd6509027
commit f6ed8fc1f5
21 changed files with 254 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/progressbar.cpp
+7 -22
View File
@@ -45,13 +45,8 @@ GUIProgressBar::GUIProgressBar(xml_node<>* node) : GUIObject(node)
child = node->first_node("resource");
if (child)
{
attr = child->first_attribute("empty");
if (attr)
mEmptyBar = PageManager::FindResource(attr->value());
attr = child->first_attribute("full");
if (attr)
mFullBar = PageManager::FindResource(attr->value());
mEmptyBar = LoadAttrImage(child, "empty");
mFullBar = LoadAttrImage(child, "full");
}
// Load the placement
@@ -61,23 +56,13 @@ GUIProgressBar::GUIProgressBar(xml_node<>* node) : GUIObject(node)
child = node->first_node("data");
if (child)
{
attr = child->first_attribute("min");
if (attr) mMinValVar = attr->value();
attr = child->first_attribute("max");
if (attr) mMaxValVar = attr->value();
attr = child->first_attribute("name");
if (attr) mCurValVar = attr->value();
mMinValVar = LoadAttrString(child, "min");
mMaxValVar = LoadAttrString(child, "max");
mCurValVar = LoadAttrString(child, "name");
}
if (mEmptyBar && mEmptyBar->GetResource())
{
mRenderW = gr_get_width(mEmptyBar->GetResource());
mRenderH = gr_get_height(mEmptyBar->GetResource());
}
return;
mRenderW = mEmptyBar->GetWidth();
mRenderH = mEmptyBar->GetHeight();
}
int GUIProgressBar::Render(void)