From 957063e915281af895529a239fee3dd52e5f0b5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Fri, 12 Jun 2009 12:26:55 +0200 Subject: 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 --- src/gui/painting/qpaintengineex.cpp | 8 ++------ 1 file 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(); } -- cgit v0.12