[Kst] extragear/graphics/kst/kst

[George Staikos]

SVN commit 490223 by staikos:

revertlast for now.  the whole thing needs a rethink


 M  +1 -26     kstborderedviewobject.cpp  
 M  +0 -2      kstborderedviewobject.h  


--- trunk/extragear/graphics/kst/kst/kstborderedviewobject.cpp #490222:490223
@@ -78,11 +78,7 @@
   if (_borderWidth > 0) {
     QRect r;
     QPen pen(_borderColor, _borderWidth);
-    if (_transparent) {
-      p.setBrush(Qt::NoBrush);
-    } else {
-      p.setBrush(_backgroundColor);
-    }
+    p.setBrush(Qt::NoBrush);
     p.setPen(pen);
     r.setX(_geom.left() + _margin + _borderWidth/2);
     r.setY(_geom.top() + _margin + _borderWidth/2);
@@ -95,27 +91,6 @@
 }
 
 
-QRegion KstBorderedViewObject::clipRegion() {
-  QRegion r;
-  if (!_transparent) {
-    r += _geom;
-  } else if (_borderWidth > 0) {
-    QRect rect;
-    rect.setX(_geom.left() + _margin);
-    rect.setY(_geom.top() + _margin);
-    rect.setWidth(_geom.width() - 2 * _margin);
-    rect.setHeight(_geom.height() - 2 * _margin);
-    r += rect;
-    rect.setX(_geom.left() + _margin + _borderWidth);
-    rect.setY(_geom.top() + _margin + _borderWidth);
-    rect.setWidth(_geom.width() - 2 * (_margin + _borderWidth));
-    rect.setHeight(_geom.height() - 2 * (_margin + _borderWidth));
-    r -= rect;
-  }
-  return r;
-}
-
-
 void KstBorderedViewObject::setBorderColor(const QColor& c) {
   if (_borderColor != c) {
     setDirty();
--- trunk/extragear/graphics/kst/kst/kstborderedviewobject.h #490222:490223
@@ -101,8 +101,6 @@
 
     virtual void paint(KstPainter& p, const QRegion& bounds);
 
-    virtual QRegion clipRegion();
-
   protected:
     virtual void readBinary(QDataStream& str);
     virtual void writeBinary(QDataStream& str);