Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- From 272ce676b80845106025b040578fe66ea0cb5b2f Mon Sep 17 00:00:00 2001
- From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
- Date: Mon, 30 May 2011 09:38:47 +0200
- Subject: [PATCH] Fixed clipping errors for non-extended paint engines.
- Partially revert change a33ef62469fd71bec for the non-extended paint
- engine path.
- Task-number: QTBUG-19525
- Reviewed-by:
- ---
- src/gui/painting/qpainter.cpp | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
- diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
- index 3735e7c..5974f53 100644
- --- a/src/gui/painting/qpainter.cpp
- +++ b/src/gui/painting/qpainter.cpp
- @@ -2788,6 +2788,9 @@ void QPainter::setClipRect(const QRect &rect, Qt::ClipOperation op)
- return;
- }
- + if (d->state->clipOperation == Qt::NoClip && op == Qt::IntersectClip)
- + op = Qt::ReplaceClip;
- +
- d->state->clipRegion = rect;
- d->state->clipOperation = op;
- if (op == Qt::NoClip || op == Qt::ReplaceClip)
- @@ -2843,6 +2846,9 @@ void QPainter::setClipRegion(const QRegion &r, Qt::ClipOperation op)
- return;
- }
- + if (d->state->clipOperation == Qt::NoClip && op == Qt::IntersectClip)
- + op = Qt::ReplaceClip;
- +
- d->state->clipRegion = r;
- d->state->clipOperation = op;
- if (op == Qt::NoClip || op == Qt::ReplaceClip)
- @@ -3248,6 +3254,9 @@ void QPainter::setClipPath(const QPainterPath &path, Qt::ClipOperation op)
- return;
- }
- + if (d->state->clipOperation == Qt::NoClip && op == Qt::IntersectClip)
- + op = Qt::ReplaceClip;
- +
- d->state->clipPath = path;
- d->state->clipOperation = op;
- if (op == Qt::NoClip || op == Qt::ReplaceClip)
- --
- 1.7.0.4
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement