summaryrefslogtreecommitdiffstats
path: root/utils/themeeditor
diff options
context:
space:
mode:
authorRobert Bieber <robby@bieberphoto.com>2010-08-06 07:53:19 +0000
committerRobert Bieber <robby@bieberphoto.com>2010-08-06 07:53:19 +0000
commit92882f2a25e10095fb21ac0ef036e08d810b8754 (patch)
treebc34bb701d65179ae2627fa97278f322390d5ce2 /utils/themeeditor
parentd505bc01195ddc4ca6e57efe42b97f1ce49d6afd (diff)
downloadrockbox-92882f2a25e10095fb21ac0ef036e08d810b8754.tar.gz
rockbox-92882f2a25e10095fb21ac0ef036e08d810b8754.tar.bz2
rockbox-92882f2a25e10095fb21ac0ef036e08d810b8754.zip
Theme Editor: Made progress bar display correctly when resized, fixed some segfaults caused by editing SBS elements from a WPS document and then turning SBS rendering off
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27735 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils/themeeditor')
-rw-r--r--utils/themeeditor/graphics/rbprogressbar.cpp2
-rw-r--r--utils/themeeditor/models/parsetreemodel.cpp9
-rw-r--r--utils/themeeditor/models/parsetreenode.cpp3
3 files changed, 14 insertions, 0 deletions
diff --git a/utils/themeeditor/graphics/rbprogressbar.cpp b/utils/themeeditor/graphics/rbprogressbar.cpp
index 292318cf60..678f3dd68b 100644
--- a/utils/themeeditor/graphics/rbprogressbar.cpp
+++ b/utils/themeeditor/graphics/rbprogressbar.cpp
@@ -107,6 +107,8 @@ void RBProgressBar::paint(QPainter *painter,
const QStyleOptionGraphicsItem *option,
QWidget *widget)
{
+ renderSize.setHeight(size.height());
+
if(bitmap && !bitmap->isNull())
{
painter->drawPixmap(renderSize, *bitmap, renderSize);
diff --git a/utils/themeeditor/models/parsetreemodel.cpp b/utils/themeeditor/models/parsetreemodel.cpp
index ed5f5740c3..2186788fd6 100644
--- a/utils/themeeditor/models/parsetreemodel.cpp
+++ b/utils/themeeditor/models/parsetreemodel.cpp
@@ -368,6 +368,15 @@ QGraphicsScene* ParseTreeModel::render(ProjectModel* project,
if(root)
root->render(info);
+// /* Making sure the Custom UI Viewport can't be selected */
+// if(sbsScreen)
+// {
+// sbsScreen->getCustomUI()->setFlag(QGraphicsItem::ItemIsSelectable,
+// false);
+// sbsScreen->getCustomUI()->setFlag(QGraphicsItem::ItemIsMovable,
+// false);
+// }
+//
return scene;
}
diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp
index 779d236012..ac2556b17f 100644
--- a/utils/themeeditor/models/parsetreenode.cpp
+++ b/utils/themeeditor/models/parsetreenode.cpp
@@ -542,6 +542,9 @@ void ParseTreeNode::render(const RBRenderInfo& info)
void ParseTreeNode::render(const RBRenderInfo &info, RBViewport* viewport,
bool noBreak)
{
+ if(!element)
+ return;
+
if(element->type == LINE)
{
for(int i = 0; i < children.count(); i++)