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

List:       koffice-devel
Subject:    kpresenter patch
From:       Thorsten Zachmann <t.zachmann () zagge ! de>
Date:       2003-10-11 14:04:44
[Download RAW message or body]

Hello,

during the testing of the last patch I found a small problem with resizing. 

To reproduce:

1. Select on object
2. resize the object
3. undo the action

After that the size of the object is not the same as before the resizing.

The attached patch solves this problems

It also solves a problem with resizing / undo of a rotated object. The problem 
there: After the undo the object is much bigger than before.

Please review. Is it ok to commit?

Thorsten

["patch52" (text/x-diff)]

Index: kprcanvas.cc
===================================================================
RCS file: /home/kde/koffice/kpresenter/kprcanvas.cc,v
retrieving revision 1.374
diff -u -3 -p -r1.374 kprcanvas.cc
--- kprcanvas.cc	11 Oct 2003 05:16:41 -0000	1.374
+++ kprcanvas.cc	11 Oct 2003 13:16:36 -0000
@@ -1108,7 +1108,7 @@ void KPrCanvas::mousePressEvent( QMouseE
         if ( kpobject ) {
             ratio = static_cast<double>( kpobject->getSize().width() ) /
                     static_cast<double>( kpobject->getSize().height() );
-            oldRect = m_view->zoomHandler()->zoomRect( kpobject->getBoundingRect() \
); +            resizeRect = kpobject->getRect();
         }
     }
 }
@@ -1196,10 +1196,10 @@ void KPrCanvas::mouseReleaseEvent( QMous
     if ( toolEditMode == TEM_MOUSE && modType != MT_NONE && modType != MT_MOVE  && \
resizeObjNum ) {  kpobject = resizeObjNum;
         if ( kpobject ) {
-            mv = KoPoint( kpobject->getOrig().x() - \
                m_view->zoomHandler()->unzoomItX( oldRect.x()),
-                          kpobject->getOrig().y() - \
                m_view->zoomHandler()->unzoomItY(oldRect.y()) );
-            sz = KoSize( kpobject->getSize().width() - \
                m_view->zoomHandler()->unzoomItX(oldRect.width()),
-                         kpobject->getSize().height() - \
m_view->zoomHandler()->unzoomItY(oldRect.height()) ); +            mv = KoPoint( \
kpobject->getOrig().x() - resizeRect.x(), +                          \
kpobject->getOrig().y() - resizeRect.y() ); +            sz = KoSize( \
kpobject->getSize().width() - resizeRect.width(), +                         \
kpobject->getSize().height() - resizeRect.height() );  }
         kpobject = 0L;
     }
Index: kprcanvas.h
===================================================================
RCS file: /home/kde/koffice/kpresenter/kprcanvas.h,v
retrieving revision 1.140
diff -u -3 -p -r1.140 kprcanvas.h
--- kprcanvas.h	11 Oct 2003 05:16:42 -0000	1.140
+++ kprcanvas.h	11 Oct 2003 13:16:37 -0000
@@ -537,7 +537,8 @@ private:
     double axisX, axisY;
     int delPageId;
     bool drawRubber;
-    QRect rubber, oldBoundingRect, oldRect;
+    QRect rubber, oldBoundingRect;
+    KoRect resizeRect;
     ToolEditMode toolEditMode;
     QRect insRect;
     KoDocumentEntry partEntry;



_______________________________________________
koffice-devel mailing list
koffice-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/koffice-devel


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