summaryrefslogtreecommitdiffstats
path: root/utils/themeeditor/graphics/rbviewport.cpp
diff options
context:
space:
mode:
authorRobert Bieber <robby@bieberphoto.com>2010-07-15 06:24:11 +0000
committerRobert Bieber <robby@bieberphoto.com>2010-07-15 06:24:11 +0000
commit15488a00eae8d10249015b88e4b7bdc47365b854 (patch)
tree62439c56fa8a926b148c7a3cc843a0c60f3aac21 /utils/themeeditor/graphics/rbviewport.cpp
parent387af97a26105fce79e6a8726752cf183d40939e (diff)
downloadrockbox-15488a00eae8d10249015b88e4b7bdc47365b854.tar.gz
rockbox-15488a00eae8d10249015b88e4b7bdc47365b854.tar.bz2
rockbox-15488a00eae8d10249015b88e4b7bdc47365b854.zip
Theme Editor: Committed FS#11477 to add a DECIMAL parameter type in the parser and adapt the Theme Editor to accomodate the change by Johnathan Gordon. Fixed bug in the parser caused by the patch (error was thrown on zero value) and adapted tag rendering for new format
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27426 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils/themeeditor/graphics/rbviewport.cpp')
-rw-r--r--utils/themeeditor/graphics/rbviewport.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/utils/themeeditor/graphics/rbviewport.cpp b/utils/themeeditor/graphics/rbviewport.cpp
index 96d7e8b276..e9c58eb6fb 100644
--- a/utils/themeeditor/graphics/rbviewport.cpp
+++ b/utils/themeeditor/graphics/rbviewport.cpp
@@ -97,24 +97,24 @@ RBViewport::RBViewport(skin_element* node, const RBRenderInfo& info)
break;
}
/* Now we grab the info common to all viewports */
- x = node->params[param++].data.numeric;
+ x = node->params[param++].data.number;
if(x < 0)
x = info.screen()->boundingRect().right() + x;
- y = node->params[param++].data.numeric;
+ y = node->params[param++].data.number;
if(y < 0)
y = info.screen()->boundingRect().bottom() + y;
if(node->params[param].type == skin_tag_parameter::DEFAULT)
w = info.screen()->getWidth() - x;
else
- w = node->params[param].data.numeric;
+ w = node->params[param].data.number;
if(w < 0)
w = info.screen()->getWidth() + w - x;
if(node->params[++param].type == skin_tag_parameter::DEFAULT)
h = info.screen()->getHeight() - y;
else
- h = node->params[param].data.numeric;
+ h = node->params[param].data.number;
if(h < 0)
h = info.screen()->getHeight() + h - y;
@@ -128,7 +128,7 @@ RBViewport::RBViewport(skin_element* node, const RBRenderInfo& info)
if(node->params[++param].type == skin_tag_parameter::DEFAULT)
font = screen->getFont(1);
else
- font = screen->getFont(node->params[param].data.numeric);
+ font = screen->getFont(node->params[param].data.number);
setPos(x, y);
size = QRectF(0, 0, w, h);