summaryrefslogtreecommitdiffstats
path: root/utils/themeeditor/models/parsetreenode.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'utils/themeeditor/models/parsetreenode.cpp')
-rw-r--r--utils/themeeditor/models/parsetreenode.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp
index a2781d237d..6c20a1d62e 100644
--- a/utils/themeeditor/models/parsetreenode.cpp
+++ b/utils/themeeditor/models/parsetreenode.cpp
@@ -510,13 +510,15 @@ void ParseTreeNode::render(const RBRenderInfo& info)
}
/* This version is called for logical lines, tags, conditionals and such */
-void ParseTreeNode::render(const RBRenderInfo &info, RBViewport* viewport)
+void ParseTreeNode::render(const RBRenderInfo &info, RBViewport* viewport,
+ bool noBreak)
{
if(element->type == LINE)
{
for(int i = 0; i < children.count(); i++)
children[i]->render(info, viewport);
- viewport->newLine();
+ if(!noBreak)
+ viewport->newLine();
}
else if(element->type == TEXT)
{
@@ -530,7 +532,7 @@ void ParseTreeNode::render(const RBRenderInfo &info, RBViewport* viewport)
else if(element->type == CONDITIONAL)
{
int child = evalTag(info, true, element->children_count).toInt();
- children[child]->render(info, viewport);
+ children[child]->render(info, viewport, true);
}
else if(element->type == SUBLINES)
{
@@ -571,7 +573,7 @@ void ParseTreeNode::render(const RBRenderInfo &info, RBViewport* viewport)
/* ...and finally render the selected branch */
if(branch >= 0)
- children[branch]->render(info, viewport);
+ children[branch]->render(info, viewport, true);
}
}