diff options
author | Robert Bieber <robby@bieberphoto.com> | 2010-08-06 07:53:19 +0000 |
---|---|---|
committer | Robert Bieber <robby@bieberphoto.com> | 2010-08-06 07:53:19 +0000 |
commit | 92882f2a25e10095fb21ac0ef036e08d810b8754 (patch) | |
tree | bc34bb701d65179ae2627fa97278f322390d5ce2 /utils | |
parent | d505bc01195ddc4ca6e57efe42b97f1ce49d6afd (diff) | |
download | rockbox-92882f2a25e10095fb21ac0ef036e08d810b8754.tar.gz 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')
-rw-r--r-- | utils/themeeditor/graphics/rbprogressbar.cpp | 2 | ||||
-rw-r--r-- | utils/themeeditor/models/parsetreemodel.cpp | 9 | ||||
-rw-r--r-- | utils/themeeditor/models/parsetreenode.cpp | 3 |
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, | |||
107 | const QStyleOptionGraphicsItem *option, | 107 | const QStyleOptionGraphicsItem *option, |
108 | QWidget *widget) | 108 | QWidget *widget) |
109 | { | 109 | { |
110 | renderSize.setHeight(size.height()); | ||
111 | |||
110 | if(bitmap && !bitmap->isNull()) | 112 | if(bitmap && !bitmap->isNull()) |
111 | { | 113 | { |
112 | painter->drawPixmap(renderSize, *bitmap, renderSize); | 114 | 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, | |||
368 | if(root) | 368 | if(root) |
369 | root->render(info); | 369 | root->render(info); |
370 | 370 | ||
371 | // /* Making sure the Custom UI Viewport can't be selected */ | ||
372 | // if(sbsScreen) | ||
373 | // { | ||
374 | // sbsScreen->getCustomUI()->setFlag(QGraphicsItem::ItemIsSelectable, | ||
375 | // false); | ||
376 | // sbsScreen->getCustomUI()->setFlag(QGraphicsItem::ItemIsMovable, | ||
377 | // false); | ||
378 | // } | ||
379 | // | ||
371 | return scene; | 380 | return scene; |
372 | } | 381 | } |
373 | 382 | ||
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) | |||
542 | void ParseTreeNode::render(const RBRenderInfo &info, RBViewport* viewport, | 542 | void ParseTreeNode::render(const RBRenderInfo &info, RBViewport* viewport, |
543 | bool noBreak) | 543 | bool noBreak) |
544 | { | 544 | { |
545 | if(!element) | ||
546 | return; | ||
547 | |||
545 | if(element->type == LINE) | 548 | if(element->type == LINE) |
546 | { | 549 | { |
547 | for(int i = 0; i < children.count(); i++) | 550 | for(int i = 0; i < children.count(); i++) |