[Kst] branches/work/kst/hierarchy/kst/src/libkstapp

[George Staikos]

SVN commit 621323 by staikos:

merge 620438.  Will back out the last few merges if they aren't fixed though.


 M  +4 -0      kstborderedviewobject.cpp  


--- branches/work/kst/hierarchy/kst/src/libkstapp/kstborderedviewobject.cpp #621322:621323
@@ -201,6 +201,10 @@
   _geom.setY(rect.top() - mpb);
   _geom.setWidth(rect.width() + 2 * mpb);
   _geom.setHeight(rect.height() + 2 * mpb);
+  
+  if(_parent) {
+    _geom = _geom.intersect(_parent->geometry());
+  }
 }