[Kst] branches/kst/1.2/kst/kst

[George Staikos]

SVN commit 520091 by staikos:

backport Andrew's clipping fix.


 M  +1 -1      kstviewlabel.cpp  
 M  +2 -2      kstviewpicture.cpp  


--- branches/kst/1.2/kst/kst/kstviewlabel.cpp #520090:520091
@@ -386,7 +386,7 @@
     _myClipMask = QRegion(bm);
     _myClipMask.translate(cr.topLeft().x(), cr.topLeft().y());
 
-    QBitmap bm1(_geom.bottomRight().x(), _geom.bottomRight().y(), true);
+    QBitmap bm1(_geom.bottomRight().x() + 1, _geom.bottomRight().y() + 1, true);
     if (!bm1.isNull()) {
       KstPainter p;
       p.setMakingMask(true);
--- branches/kst/1.2/kst/kst/kstviewpicture.cpp #520090:520091
@@ -71,7 +71,7 @@
 QRegion KstViewPicture::clipRegion() {
   if (_clipMask.isNull()) {
     _myClipMask = QRegion();
-    QBitmap bm1(_geom.bottomRight().x(), _geom.bottomRight().y(), true);
+    QBitmap bm1(_geom.bottomRight().x() + 1, _geom.bottomRight().y() + 1, true);
     if (!bm1.isNull()) {
       KstPainter p;
       p.setMakingMask(true);
@@ -82,7 +82,7 @@
       p.end();
       _clipMask = QRegion(bm1);
     }
-    QBitmap bm2(_geom.bottomRight().x(), _geom.bottomRight().y(), true);
+    QBitmap bm2(_geom.bottomRight().x() + 1, _geom.bottomRight().y() + 1, true);
     if (!bm2.isNull()) {
       KstPainter p;
       p.setMakingMask(true);