feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Generate a style option for the paint function in the node instances

Browse Source 
WebView is expecting a valid QStyleOptionGraphicsItem argument.

Reviewed-by: kkoehne
This commit is contained in:
Marco Bubke
2010-05-18 21:24:33 +02:00
committed by Kai Koehne
parent 89482b1bfc
commit cdeee01c73
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/qmldesigner/designercore/instances/graphicsobjectnodeinstance.cpp
View File

@@ -31,6 +31,8 @@
#include "invalidnodeinstanceexception.h" #include "invalidnodeinstanceexception.h"
#include <QGraphicsObject> #include <QGraphicsObject>
#include "private/qgraphicsitem_p.h"
#include <QStyleOptionGraphicsItem>
#include "nodemetainfo.h" #include "nodemetainfo.h"
namespace QmlDesigner { namespace QmlDesigner {
@@ -153,13 +155,21 @@ bool GraphicsObjectNodeInstance::equalGraphicsItem(QGraphicsItem *item) const
return item == graphicsObject(); return item == graphicsObject();
} }
void initOption(QGraphicsItem *item, QStyleOptionGraphicsItem *option, const QTransform &transform)
{
QGraphicsItemPrivate *privateItem = QGraphicsItemPrivate::get(item);
privateItem->initStyleOption(option, transform, QRegion());
}
void GraphicsObjectNodeInstance::paintRecursively(QGraphicsItem *graphicsItem, QPainter *painter) const void GraphicsObjectNodeInstance::paintRecursively(QGraphicsItem *graphicsItem, QPainter *painter) const
{ {
if (graphicsItem->isVisible()) { if (graphicsItem->isVisible()) {
painter->save(); painter->save();
painter->setTransform(graphicsItem->itemTransform(graphicsItem->parentItem()), true); painter->setTransform(graphicsItem->itemTransform(graphicsItem->parentItem()), true);
painter->setOpacity(graphicsItem->opacity() * painter->opacity()); painter->setOpacity(graphicsItem->opacity() * painter->opacity());
graphicsItem->paint(painter, 0); QStyleOptionGraphicsItem option;
initOption(graphicsItem, &option, painter->transform());
graphicsItem->paint(painter, &option);
foreach(QGraphicsItem *childItem, graphicsItem->childItems()) { foreach(QGraphicsItem *childItem, graphicsItem->childItems()) {
paintRecursively(childItem, painter); paintRecursively(childItem, painter);
} }
@@ -171,12 +181,16 @@ void GraphicsObjectNodeInstance::paint(QPainter *painter) const
{ {
painter->save(); painter->save();
Q_ASSERT(graphicsObject()); Q_ASSERT(graphicsObject());
if (hasContent()) if (hasContent()) {
graphicsObject()->paint(painter, 0); QStyleOptionGraphicsItem option;
initOption(graphicsObject(), &option, painter->transform());
graphicsObject()->paint(painter, &option);
}
foreach(QGraphicsItem *graphicsItem, graphicsObject()->childItems()) { foreach(QGraphicsItem *graphicsItem, graphicsObject()->childItems()) {
QGraphicsObject *graphicsObject = qgraphicsitem_cast<QGraphicsObject*>(graphicsItem); QGraphicsObject *graphicsObject = qgraphicsitem_cast<QGraphicsObject*>(graphicsItem);
if (graphicsObject && !nodeInstanceView()->hasInstanceForObject(graphicsObject)) if (graphicsObject
&& !nodeInstanceView()->hasInstanceForObject(graphicsObject))
paintRecursively(graphicsItem, painter); paintRecursively(graphicsItem, painter);
} }