summaryrefslogtreecommitdiff
path: root/utils/themeeditor/models
diff options
context:
space:
mode:
authorRobert Bieber <robby@bieberphoto.com>2010-07-04 01:47:04 +0000
committerRobert Bieber <robby@bieberphoto.com>2010-07-04 01:47:04 +0000
commit2a7fc15448b7e2e1f599419da0814aaffbeeae27 (patch)
tree157085239e431ea1b9445bc943ca53f4a9ec294b /utils/themeeditor/models
parent32ff4e93bdc15a21faf23e46bd2e0eb659bf8f31 (diff)
downloadrockbox-2a7fc15448b7e2e1f599419da0814aaffbeeae27.zip
rockbox-2a7fc15448b7e2e1f599419da0814aaffbeeae27.tar.gz
rockbox-2a7fc15448b7e2e1f599419da0814aaffbeeae27.tar.bz2
rockbox-2a7fc15448b7e2e1f599419da0814aaffbeeae27.tar.xz
Theme Editor: WPS documents rendered within SBS documents can now set backdrops
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27269 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils/themeeditor/models')
-rw-r--r--utils/themeeditor/models/parsetreemodel.cpp4
-rw-r--r--utils/themeeditor/models/parsetreenode.cpp5
2 files changed, 6 insertions, 3 deletions
diff --git a/utils/themeeditor/models/parsetreemodel.cpp b/utils/themeeditor/models/parsetreemodel.cpp
index 47b2417..a04a0d9 100644
--- a/utils/themeeditor/models/parsetreemodel.cpp
+++ b/utils/themeeditor/models/parsetreemodel.cpp
@@ -340,7 +340,7 @@ QGraphicsScene* ParseTreeModel::render(ProjectModel* project,
}
RBScreen* screen = 0;
- RBRenderInfo info(this, project, &settings, device, screen);
+ RBRenderInfo info(this, project, &settings, device, screen, sbsScreen);
/* Adding the screen */
if(sbsScreen)
@@ -351,7 +351,7 @@ QGraphicsScene* ParseTreeModel::render(ProjectModel* project,
if(!sbsScreen)
scene->addItem(screen);
- info = RBRenderInfo(this, project, &settings, device, screen);
+ info = RBRenderInfo(this, project, &settings, device, screen, sbsScreen);
/* Rendering the tree */
diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp
index 1fda29f..7efcbc3 100644
--- a/utils/themeeditor/models/parsetreenode.cpp
+++ b/utils/themeeditor/models/parsetreenode.cpp
@@ -811,7 +811,10 @@ bool ParseTreeNode::execTag(const RBRenderInfo& info, RBViewport* viewport)
case '\0':
/* %X */
filename = QString(element->params[0].data.text);
- info.screen()->setBackdrop(filename);
+ if(info.sbsScreen())
+ info.sbsScreen()->setBackdrop(filename);
+ else
+ info.screen()->setBackdrop(filename);
return true;
}