[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/khtml-svg
From:       Nikolas Zimmermann <wildfox () kde ! org>
Date:       2006-04-03 21:41:37
Message-ID: 1144100497.025024.11180.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 526113 by wildfox:

Forwardport Maksim's fix for "all pages blank" - thanks for fixing so fast :-)


 M  +2 -6      khtmlview.cpp  


--- branches/work/khtml-svg/khtmlview.cpp #526112:526113
@@ -639,8 +639,8 @@
     }
     d->painting = true;
 
-    QPoint pt = contentsToViewport(QPoint(ex, ey)); /// ??? ex/ey below instead - check history
-    QRegion cr = QRect(pt.x(), pt.y(), ew, eh);
+    QPoint pt = contentsToViewport(QPoint(ex, ey));
+    QRegion cr = QRect(ex, ey, ew, eh);
 
     // kdDebug(6000) << "clip rect: " << QRect(pt.x(), pt.y(), ew, eh) << endl;
     for (Q3PtrDictIterator<QWidget> it(d->visibleWidgets); it.current(); ++it) {
@@ -654,15 +654,11 @@
             RenderLayer* rl = rw->needsMask() ? rw->enclosingStackingContext() : 0;
             QRegion mask = rl ? rl->getMask() : QRegion();
             if (!mask.isEmpty()) {
-                QPoint o(0,0);
-                o = contentsToViewport(o);
-                mask.translate(o.x(),o.y());
                 mask = mask.intersect( QRect(g.x(),g.y(),g.width(),g.height()) );
                 cr -= mask;
             } else {
                 int x, y;
                 rw->absolutePosition(x,y);
-                contentsToViewport(x,y,x,y);
                 cr -= QRect(x,y,rw->width(),rw->height());
             }
         }
[prev in list] [next in list] [prev in thread] [next in thread]