diff options
| author | Ulf Hermann <ulf.hermann@digia.com> | 2014-06-02 12:17:10 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-03 12:51:27 +0200 |
| commit | f45fe58ad2aa741c90b756643da75f1a6bc2fdf6 (patch) | |
| tree | e34226bfaa2eef37313d14dbbb94c28680b98635 /src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp | |
| parent | d6f71a6b47ad53bbce13db367ccb996ae2d392c8 (diff) | |
Prevent initial clipping in Context2D
Don't set an initial clip path and only start clipping once a clip
path has manually been set.
Task-number: QTBUG-39114
Change-Id: Id277775d6eb0be87bead0e5d076f32a07ebdfe5c
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp')
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp b/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp index 5697c25ff0..cb09c9d4ff 100644 --- a/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp +++ b/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp @@ -215,7 +215,8 @@ void QQuickContext2DCommandBuffer::setPainterState(QPainter* p, const QQuickCont if (state.globalCompositeOperation != p->compositionMode()) p->setCompositionMode(state.globalCompositeOperation); - p->setClipPath(state.clipPath); + if (state.clip) + p->setClipPath(state.clipPath); } static void qt_drawImage(QPainter *p, QQuickContext2D::State& state, QImage image, const QRectF& sr, const QRectF& dr, bool shadow = false) |