forked from len0rd/rockbox
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
This commit is contained in:
parent
d505bc0119
commit
92882f2a25
3 changed files with 14 additions and 0 deletions
|
@ -107,6 +107,8 @@ void RBProgressBar::paint(QPainter *painter,
|
||||||
const QStyleOptionGraphicsItem *option,
|
const QStyleOptionGraphicsItem *option,
|
||||||
QWidget *widget)
|
QWidget *widget)
|
||||||
{
|
{
|
||||||
|
renderSize.setHeight(size.height());
|
||||||
|
|
||||||
if(bitmap && !bitmap->isNull())
|
if(bitmap && !bitmap->isNull())
|
||||||
{
|
{
|
||||||
painter->drawPixmap(renderSize, *bitmap, renderSize);
|
painter->drawPixmap(renderSize, *bitmap, renderSize);
|
||||||
|
|
|
@ -368,6 +368,15 @@ QGraphicsScene* ParseTreeModel::render(ProjectModel* project,
|
||||||
if(root)
|
if(root)
|
||||||
root->render(info);
|
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;
|
return scene;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -542,6 +542,9 @@ void ParseTreeNode::render(const RBRenderInfo& info)
|
||||||
void ParseTreeNode::render(const RBRenderInfo &info, RBViewport* viewport,
|
void ParseTreeNode::render(const RBRenderInfo &info, RBViewport* viewport,
|
||||||
bool noBreak)
|
bool noBreak)
|
||||||
{
|
{
|
||||||
|
if(!element)
|
||||||
|
return;
|
||||||
|
|
||||||
if(element->type == LINE)
|
if(element->type == LINE)
|
||||||
{
|
{
|
||||||
for(int i = 0; i < children.count(); i++)
|
for(int i = 0; i < children.count(); i++)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue