devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Theme Editor: Renderer now adds a newline after EVERY logical line in the parse tree

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27222 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Robert Bieber 2010-07-01 20:30:19 +00:00
parent a43fbbb9a3
commit a54bfaa69e
3 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
utils/themeeditor/graphics/rbviewport.cpp
View file

@ -154,12 +154,7 @@ void RBViewport::paint(QPainter *painter,
painter->fillRect(QRectF(0, 0, size.width(), 8), statusBarTexture); painter->fillRect(QRectF(0, 0, size.width(), 8), statusBarTexture);
} }
void RBViewport::newLine(bool force) void RBViewport::newLine()
{
if(leftText.count() != 0
|| centerText.count() != 0
|| rightText.count() != 0
|| force)
{ {
textOffset.setY(textOffset.y() + lineHeight); textOffset.setY(textOffset.y() + lineHeight);
textOffset.setX(0); textOffset.setX(0);
@ -168,7 +163,6 @@ void RBViewport::newLine(bool force)
rightText.clear(); rightText.clear();
centerText.clear(); centerText.clear();
} }
}
void RBViewport::write(QString text) void RBViewport::write(QString text)
{ {

2
utils/themeeditor/graphics/rbviewport.h
View file

@ -53,7 +53,7 @@ public:
void makeCustomUI(){ customUI = true; } void makeCustomUI(){ customUI = true; }
void clearCustomUI(){ customUI = false; } void clearCustomUI(){ customUI = false; }
void newLine(bool force = false); void newLine();
void write(QString text); void write(QString text);
void alignText(Alignment align){ textAlign = align; } void alignText(Alignment align){ textAlign = align; }

2
utils/themeeditor/models/parsetreenode.cpp
View file

@ -518,7 +518,7 @@ void ParseTreeNode::render(const RBRenderInfo &info, RBViewport* viewport,
for(int i = 0; i < children.count(); i++) for(int i = 0; i < children.count(); i++)
children[i]->render(info, viewport); children[i]->render(info, viewport);
if(!noBreak) if(!noBreak)
viewport->newLine(children.count() > 0 ? false : true); viewport->newLine();
} }
else if(element->type == TEXT) else if(element->type == TEXT)
{ {