diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-06-19 17:50:11 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-06-19 17:50:36 +0200 |
commit | 8af287965907e785afefaa4dd010834a76f2d0f4 (patch) | |
tree | 100f98b1876d72821c6fd3b67631e97fd142aa50 /examples/quick/scenegraph | |
parent | 6f2bdb816dc816461cf3888eb732f71904b6a7ab (diff) | |
parent | ee076afedccbe1d37306a7972051f84eb036d655 (diff) |
Merge branch 'wip/scenegraphng' into dev
Say hello to Shape.
Change-Id: I1093feee4acc375e62bae1d351db0a7969a536d0
Diffstat (limited to 'examples/quick/scenegraph')
-rw-r--r-- | examples/quick/scenegraph/rendernode/softwarerenderer.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/examples/quick/scenegraph/rendernode/softwarerenderer.cpp b/examples/quick/scenegraph/rendernode/softwarerenderer.cpp index d303b9ef13..f4ee976705 100644 --- a/examples/quick/scenegraph/rendernode/softwarerenderer.cpp +++ b/examples/quick/scenegraph/rendernode/softwarerenderer.cpp @@ -64,11 +64,12 @@ void SoftwareRenderNode::render(const RenderState *renderState) QPainter *p = static_cast<QPainter *>(rif->getResource(m_item->window(), QSGRendererInterface::PainterResource)); Q_ASSERT(p); - p->setTransform(matrix()->toTransform()); - p->setOpacity(inheritedOpacity()); const QRegion *clipRegion = renderState->clipRegion(); if (clipRegion && !clipRegion->isEmpty()) - p->setClipRegion(*clipRegion, Qt::IntersectClip); + p->setClipRegion(*clipRegion, Qt::ReplaceClip); // must be done before setTransform + + p->setTransform(matrix()->toTransform()); + p->setOpacity(inheritedOpacity()); const QPointF p0(m_item->width() - 1, m_item->height() - 1); const QPointF p1(0, 0); |