summaryrefslogtreecommitdiffstats
path: root/utils/themeeditor/models/parsetreenode.cpp
diff options
context:
space:
mode:
authorRobert Bieber <robby@bieberphoto.com>2010-07-04 01:39:57 +0000
committerRobert Bieber <robby@bieberphoto.com>2010-07-04 01:39:57 +0000
commit32ff4e93bdc15a21faf23e46bd2e0eb659bf8f31 (patch)
tree3e24bc8a53032bece6aa428c71796ca26ee27379 /utils/themeeditor/models/parsetreenode.cpp
parentd4e7ab7a93a268a9fbb1255b7ca3a39a09c090e2 (diff)
downloadrockbox-32ff4e93bdc15a21faf23e46bd2e0eb659bf8f31.tar.gz
rockbox-32ff4e93bdc15a21faf23e46bd2e0eb659bf8f31.tar.bz2
rockbox-32ff4e93bdc15a21faf23e46bd2e0eb659bf8f31.zip
Theme Editor: Implemented a flags column in the tag table, removed the \n flag at the end of the param list and replaced it with a NOBREAK flag to prevent the renderer from inserting a line break at the end of the line. Modified the theme editor's renderer to accomodate this flag
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27268 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils/themeeditor/models/parsetreenode.cpp')
-rw-r--r--utils/themeeditor/models/parsetreenode.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp
index 0a500bfbf2..1fda29fec7 100644
--- a/utils/themeeditor/models/parsetreenode.cpp
+++ b/utils/themeeditor/models/parsetreenode.cpp
@@ -31,6 +31,7 @@
#include <iostream>
int ParseTreeNode::openConditionals = 0;
+bool ParseTreeNode::breakFlag = false;
/* Root element constructor */
ParseTreeNode::ParseTreeNode(struct skin_element* data)
@@ -520,8 +521,11 @@ void ParseTreeNode::render(const RBRenderInfo &info, RBViewport* viewport,
{
for(int i = 0; i < children.count(); i++)
children[i]->render(info, viewport);
- if(!noBreak)
+ if(!noBreak && !breakFlag)
viewport->newLine();
+
+ if(breakFlag)
+ breakFlag = false;
}
else if(element->type == TEXT)
{
@@ -531,6 +535,8 @@ void ParseTreeNode::render(const RBRenderInfo &info, RBViewport* viewport,
{
if(!execTag(info, viewport))
viewport->write(evalTag(info).toString());
+ if(element->tag->flags & NOBREAK)
+ breakFlag = true;
}
else if(element->type == CONDITIONAL)
{