diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-06-12 10:26:55 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-06-12 10:38:23 (GMT) |
| commit | 957063e915281af895529a239fee3dd52e5f0b5a (patch) | |
| tree | c5c773cd4fa6f52815fff4288221f5753213aa4d | |
| parent | 9bbd0bed3afc44ece34119a9c563726b0e6298a8 (diff) | |
| download | Qt-957063e915281af895529a239fee3dd52e5f0b5a.zip Qt-957063e915281af895529a239fee3dd52e5f0b5a.tar.gz Qt-957063e915281af895529a239fee3dd52e5f0b5a.tar.bz2 | |
Fixed clipping bugs in GL 2 paint engine.
Similar to what was done in f86dcade8716a0aee841ba05740887598633de17,
we shouldn't multiply by the redirectionMatrix in replayClipOperations()
as the clip info matrices already contain the redirectionMatrix.
Reviewed-by: bnilsen
| -rw-r--r-- | src/gui/painting/qpaintengineex.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp index 67a3fa9..222e29f 100644 --- a/src/gui/painting/qpaintengineex.cpp +++ b/src/gui/painting/qpaintengineex.cpp @@ -149,15 +149,11 @@ void QPaintEngineExPrivate::replayClipOperations() QTransform transform = q->state()->matrix; - const QTransform &redirection = q->state()->redirectionMatrix; - for (int i = 0; i < clipInfo.size(); ++i) { const QPainterClipInfo &info = clipInfo.at(i); - QTransform combined = info.matrix * redirection; - - if (combined != q->state()->matrix) { - q->state()->matrix = combined; + if (info.matrix != q->state()->matrix) { + q->state()->matrix = info.matrix; q->transformChanged(); } |