[Kst] extragear/graphics/kst/kst

[George Staikos]

SVN commit 489906 by staikos:

make images print properly again
BUG: 118683


 M  +8 -8      kstviewpicture.cpp  


--- trunk/extragear/graphics/kst/kst/kstviewpicture.cpp #489905:489906
@@ -69,14 +69,14 @@
 
 void KstViewPicture::paint(KstPainter& p, const QRegion& bounds) {
   p.save();
-  if (p.type() != KstPainter::P_PRINT && p.type() != KstPainter::P_EXPORT) {
-    if (p.makingMask()) {
-      p.setRasterOp(Qt::SetROP);
-      KstBorderedViewObject::paint(p, bounds);
-    } else {
+  if (p.makingMask()) {
+    p.setRasterOp(Qt::SetROP);
+    KstBorderedViewObject::paint(p, bounds);
+  } else {
+    KstBorderedViewObject::paint(p, bounds);
+    // FIXME: inefficient
+    if (p.type() != KstPainter::P_PRINT && p.type() != KstPainter::P_EXPORT) {
       QRegion boundary = bounds & _lastClipRegion;
-      KstBorderedViewObject::paint(p, bounds);
-      // FIXME: inefficient
       for (KstViewObjectList::Iterator i = _children.begin(); i != _children.end(); ++i) {
         boundary -= (*i)->clipRegion();
       }
@@ -84,7 +84,7 @@
       p.setClipRegion(boundary);
     }
   }
-  
+
   if (_image.isNull()) {
     QRect r(_geom);
     r.setWidth(_geom.width() - 1);