summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorRobert Bieber <robby@bieberphoto.com>2010-07-11 04:36:05 +0000
committerRobert Bieber <robby@bieberphoto.com>2010-07-11 04:36:05 +0000
commit364af4f5748556acef8a71742fe1b17062a6bb46 (patch)
tree371111c94b77e722c2f983517b905c04b47c5d62 /utils
parenta6df932003513a0811c9231475aa58c802cc4c80 (diff)
downloadrockbox-364af4f5748556acef8a71742fe1b17062a6bb46.tar.gz
rockbox-364af4f5748556acef8a71742fe1b17062a6bb46.tar.bz2
rockbox-364af4f5748556acef8a71742fe1b17062a6bb46.zip
Theme Editor: Fixed rendering behavior of default viewport. Now when other viewports are present in the skin, only _text_ from the default viewport is not rendered
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27378 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils')
-rw-r--r--utils/themeeditor/graphics/rbviewport.cpp8
-rw-r--r--utils/themeeditor/graphics/rbviewport.h2
2 files changed, 9 insertions, 1 deletions
diff --git a/utils/themeeditor/graphics/rbviewport.cpp b/utils/themeeditor/graphics/rbviewport.cpp
index 4422f19b86..96d7e8b276 100644
--- a/utils/themeeditor/graphics/rbviewport.cpp
+++ b/utils/themeeditor/graphics/rbviewport.cpp
@@ -51,7 +51,7 @@ RBViewport::RBViewport(skin_element* node, const RBRenderInfo& info)
if(info.model()->rowCount(QModelIndex()) > 1)
{
/* If there is more than one viewport in the document */
- setVisible(false);
+ textOffset.setX(-1);
}
else
{
@@ -175,6 +175,9 @@ void RBViewport::paint(QPainter *painter,
void RBViewport::newLine()
{
+ if(textOffset.x() < 0)
+ return;
+
if(leftText != "")
alignLeft();
@@ -201,6 +204,9 @@ void RBViewport::newLine()
void RBViewport::write(QString text)
{
+ if(textOffset.x() < 0)
+ return;
+
if(textAlign == Left)
{
leftText.append(text);
diff --git a/utils/themeeditor/graphics/rbviewport.h b/utils/themeeditor/graphics/rbviewport.h
index a9b706d95f..c665108618 100644
--- a/utils/themeeditor/graphics/rbviewport.h
+++ b/utils/themeeditor/graphics/rbviewport.h
@@ -64,6 +64,8 @@ public:
void addTextOffset(int height){ textOffset.setY(textOffset.y() + height); }
void flushText()
{
+ if(textOffset.x() < 0)
+ return;
alignLeft();
alignRight();
alignCenter();