From d22b55d3159c001dc6b37422cefbec6775996494 Mon Sep 17 00:00:00 2001
From: Gunnar Sletta <gunnar@trolltech.com>
Date: Fri, 4 Sep 2009 08:30:02 +0200
Subject: Fixed clipping of native style elements when raster is used on mac

Reviewed-by: Trond
---
 src/gui/painting/qpaintengine_mac.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gui/painting/qpaintengine_mac.cpp b/src/gui/painting/qpaintengine_mac.cpp
index 40ab95e..74fc793 100644
--- a/src/gui/painting/qpaintengine_mac.cpp
+++ b/src/gui/painting/qpaintengine_mac.cpp
@@ -121,11 +121,15 @@ QMacCGContext::QMacCGContext(QPainter *p)
 
         if (devType == QInternal::Widget) {
             QRegion clip = p->paintEngine()->systemClip();
+            QTransform native = p->deviceTransform();
+            QTransform logical = p->combinedTransform();
             if (p->hasClipping()) {
+                QRegion r = p->clipRegion();
+                r.translate(native.dx() - logical.dx(), native.dy() - logical.dy());
                 if (clip.isEmpty())
-                    clip = p->clipRegion();
+                    clip = r;
                 else
-                    clip &= p->clipRegion();
+                    clip &= r;
             }
             qt_mac_clip_cg(context, clip, 0);
 
-- 
cgit v0.12