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

List:       kde-commits
Subject:    koffice/libs/flake
From:       Peter Simonsson <psn () linux ! se>
Date:       2006-12-30 12:29:22
Message-ID: 1167481762.210427.16352.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 617802 by psn:

Ok go back to not caring about the position as jaham thinks that's the correct behavior


 M  +5 -14     KoShapeLayer.cpp  
 M  +0 -2      KoShapeLayer.h  


--- trunk/koffice/libs/flake/KoShapeLayer.cpp #617801:617802
@@ -33,29 +33,20 @@
 
 QRectF KoShapeLayer::boundingRect() const
 {
-    // The layer always has position 0,0
-    QRectF bb(0.0, 0.0, 1.0, 1.0);
-    QRectF shapeRect;
+    QRectF bb;
 
     foreach( KoShape* shape, iterator() )
     {
-        bb = bb.unite( shape->boundingRect() );
+        if(bb.isEmpty())
+             bb = shape->boundingRect();
+        else
+            bb = bb.unite( shape->boundingRect() );
     }
 
     return bb;
 }
 
-QSizeF KoShapeLayer::size() const
-{
-    return boundingRect().size();
-}
 
-QPointF KoShapeLayer::position() const
-{
-    return QPointF(0.0, 0.0);
-}
-
-
 //  ############# LayerMembers #############
 KoShapeLayer::LayerMembers::LayerMembers()
 {
--- trunk/koffice/libs/flake/KoShapeLayer.h #617801:617802
@@ -40,8 +40,6 @@
     virtual void paintComponent(QPainter &, const KoViewConverter &) {};
     bool hitTest( const QPointF &position ) const;
     virtual QRectF boundingRect() const;
-    virtual QSizeF size() const;
-    virtual QPointF position() const;
 private:
     class LayerMembers: public KoShapeContainerModel {
         public:
[prev in list] [next in list] [prev in thread] [next in thread]