diff options
| author | Bjoern Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-04-29 17:51:02 (GMT) |
|---|---|---|
| committer | Bjoern Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-04-29 17:51:02 (GMT) |
| commit | d355e069ca1952504ef8cc6fb44350b53314d5d5 (patch) | |
| tree | f2372d54b1bf988312ff4ab0b91b7d3e74629367 /src/gui/painting/qpainter.cpp | |
| parent | d20bf7c8b368cb56df1a965793edbd23ff0c3213 (diff) | |
| parent | 073b7ce298b0e079f310ec22dee44a9fc0af9ee6 (diff) | |
| download | Qt-d355e069ca1952504ef8cc6fb44350b53314d5d5.zip Qt-d355e069ca1952504ef8cc6fb44350b53314d5d5.tar.gz Qt-d355e069ca1952504ef8cc6fb44350b53314d5d5.tar.bz2 | |
Merge commit 'origin/4.5'
Diffstat (limited to 'src/gui/painting/qpainter.cpp')
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index d9c7937..b158392 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -2398,7 +2398,6 @@ QRegion QPainter::clipRegion() const // ### Falcon: Use QPainterPath for (int i=0; i<d->state->clipInfo.size(); ++i) { const QPainterClipInfo &info = d->state->clipInfo.at(i); - QRegion other; switch (info.clipType) { case QPainterClipInfo::RegionClip: { @@ -2451,15 +2450,20 @@ QRegion QPainter::clipRegion() const lastWasNothing = false; continue; } - if (info.operation == Qt::IntersectClip) - region &= QRegion(info.rect) * matrix; - else if (info.operation == Qt::UniteClip) + if (info.operation == Qt::IntersectClip) { + // Use rect intersection if possible. + if (matrix.type() <= QTransform::TxScale) + region &= matrix.mapRect(info.rect); + else + region &= matrix.map(QRegion(info.rect)); + } else if (info.operation == Qt::UniteClip) { region |= QRegion(info.rect) * matrix; - else if (info.operation == Qt::NoClip) { + } else if (info.operation == Qt::NoClip) { lastWasNothing = true; region = QRegion(); - } else + } else { region = QRegion(info.rect) * matrix; + } break; } @@ -2470,15 +2474,20 @@ QRegion QPainter::clipRegion() const lastWasNothing = false; continue; } - if (info.operation == Qt::IntersectClip) - region &= QRegion(info.rectf.toRect()) * matrix; - else if (info.operation == Qt::UniteClip) + if (info.operation == Qt::IntersectClip) { + // Use rect intersection if possible. + if (matrix.type() <= QTransform::TxScale) + region &= matrix.mapRect(info.rectf.toRect()); + else + region &= matrix.map(QRegion(info.rectf.toRect())); + } else if (info.operation == Qt::UniteClip) { region |= QRegion(info.rectf.toRect()) * matrix; - else if (info.operation == Qt::NoClip) { + } else if (info.operation == Qt::NoClip) { lastWasNothing = true; region = QRegion(); - } else + } else { region = QRegion(info.rectf.toRect()) * matrix; + } break; } } |