1
0
Fork 0
forked from len0rd/rockbox

Theme Editor: Made blank lines render newlines in the output

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27206 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Robert Bieber 2010-07-01 02:29:58 +00:00
parent 8cd51a70c5
commit c215d97b4d
3 changed files with 5 additions and 4 deletions

View file

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

View file

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

View file

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