diff options
-rw-r--r-- | utils/themeeditor/graphics/rbviewport.cpp | 20 | ||||
-rw-r--r-- | utils/themeeditor/graphics/rbviewport.h | 2 | ||||
-rw-r--r-- | utils/themeeditor/models/parsetreenode.cpp | 2 |
3 files changed, 9 insertions, 15 deletions
diff --git a/utils/themeeditor/graphics/rbviewport.cpp b/utils/themeeditor/graphics/rbviewport.cpp index 2dd272927e..d4a8ede090 100644 --- a/utils/themeeditor/graphics/rbviewport.cpp +++ b/utils/themeeditor/graphics/rbviewport.cpp @@ -154,20 +154,14 @@ void RBViewport::paint(QPainter *painter, 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.setX(0); - textAlign = Left; - leftText.clear(); - rightText.clear(); - centerText.clear(); - } + textOffset.setY(textOffset.y() + lineHeight); + textOffset.setX(0); + textAlign = Left; + leftText.clear(); + rightText.clear(); + centerText.clear(); } void RBViewport::write(QString text) diff --git a/utils/themeeditor/graphics/rbviewport.h b/utils/themeeditor/graphics/rbviewport.h index ee7d0540eb..2aff315873 100644 --- a/utils/themeeditor/graphics/rbviewport.h +++ b/utils/themeeditor/graphics/rbviewport.h @@ -53,7 +53,7 @@ public: void makeCustomUI(){ customUI = true; } void clearCustomUI(){ customUI = false; } - void newLine(bool force = false); + void newLine(); void write(QString text); void alignText(Alignment align){ textAlign = align; } diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp index 8edbbe9b6c..d10bb08936 100644 --- a/utils/themeeditor/models/parsetreenode.cpp +++ b/utils/themeeditor/models/parsetreenode.cpp @@ -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(children.count() > 0 ? false : true); + viewport->newLine(); } else if(element->type == TEXT) { |