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

GUI: Support styles in xml to reduce xml file size

Browse Source 
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
This commit is contained in:
Ethan Yonker
2015-02-18 14:35:00 -06:00
parent 10ec0175c8
commit 21ff02a693
25 changed files with 1055 additions and 2977 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/animation.cpp
+8 -19
View File
@@ -29,7 +29,6 @@ extern "C" {
GUIAnimation::GUIAnimation(xml_node<>* node) : GUIObject(node)
{
xml_node<>* child;
xml_attribute<>* attr;
mAnimation = NULL;
mFrame = 1;
@@ -40,36 +39,26 @@ GUIAnimation::GUIAnimation(xml_node<>* node) : GUIObject(node)
if (!node) return;
child = node->first_node("resource");
if (child)
{
mAnimation = LoadAttrAnimation(child, "name");
}
mAnimation = LoadAttrAnimation(FindNode(node, "resource"), "name");
// Load the placement
LoadPlacement(node->first_node("placement"), &mRenderX, &mRenderY, NULL, NULL, &mPlacement);
LoadPlacement(FindNode(node, "placement"), &mRenderX, &mRenderY, NULL, NULL, &mPlacement);
child = node->first_node("speed");
child = FindNode(node, "speed");
if (child)
{
attr = child->first_attribute("fps");
if (attr)
mFPS = atoi(attr->value());
attr = child->first_attribute("render");
if (attr)
mRender = atoi(attr->value());
mFPS = LoadAttrInt(child, "fps", mFPS);
mRender = LoadAttrInt(child, "render", mRender);
}
if (mFPS > 30) mFPS = 30;
child = node->first_node("loop");
child = FindNode(node, "loop");
if (child)
{
attr = child->first_attribute("frame");
xml_attribute<>* attr = child->first_attribute("frame");
if (attr)
mLoop = atoi(attr->value()) - 1;
attr = child->first_attribute("start");
if (attr)
mFrame = atoi(attr->value());
mFrame = LoadAttrInt(child, "start", mFrame);
}
// Fetch the render sizes