From koffice Tue Aug 27 16:01:50 2002 From: Thorsten Zachmann Date: Tue, 27 Aug 2002 16:01:50 +0000 To: koffice Subject: kpresenter patch X-MARC-Message: https://marc.info/?l=koffice&m=103046742407326 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--------------Boundary-00=_27FILGWQGA2S7T4SRDFZ" --------------Boundary-00=_27FILGWQGA2S7T4SRDFZ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hello all the attached patch solves the problem that objects which have only a=20 minimumsice can't be moved.=20 The attached patch makes this possible. Is it ok to commit? Thorsten --------------Boundary-00=_27FILGWQGA2S7T4SRDFZ Content-Type: text/x-diff; charset="us-ascii"; name="patch23" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch23" Index: kpobject.cc =================================================================== RCS file: /home/kde/koffice/kpresenter/kpobject.cc,v retrieving revision 1.104 diff -u -3 -p -r1.104 kpobject.cc --- kpobject.cc 2002/08/26 12:05:43 1.104 +++ kpobject.cc 2002/08/27 15:55:23 @@ -442,49 +442,50 @@ QCursor KPObject::getCursor( const KoPoi if ( !r.contains( _point ) ) return Qt::arrowCursor; - if ( px >= ox && py >= oy && px <= ox + 6 && py <= oy + 6 ) + int sz = 4; + if ( px >= ox && py >= oy && px <= ox + QMIN( ow / 3, sz ) && py <= oy + QMIN( oh / 3, sz ) ) { _modType = MT_RESIZE_LU; return Qt::sizeFDiagCursor; } - if ( px >= ox && py >= oy + oh / 2 - 3 && px <= ox + 6 && py <= oy + oh / 2 + 3 ) + if ( px >= ox && py >= oy + oh / 2 - QMIN( oh / 6, sz / 2 ) && px <= ox + QMIN( ow / 3, sz) && py <= oy + oh / 2 + QMIN( oh / 6, sz / 2 ) ) { _modType = MT_RESIZE_LF; return Qt::sizeHorCursor; } - if ( px >= ox && py >= oy + oh - 6 && px <= ox + 6 && py <= oy + oh ) + if ( px >= ox && py >= oy + oh - QMIN( oh / 3, sz ) && px <= ox + QMIN( ow / 3, sz ) && py <= oy + oh ) { _modType = MT_RESIZE_LD; return Qt::sizeBDiagCursor; } - if ( px >= ox + ow / 2 - 3 && py >= oy && px <= ox + ow / 2 + 3 && py <= oy + 6 ) + if ( px >= ox + ow / 2 - QMIN( ow / 6, sz / 2 ) && py >= oy && px <= ox + ow / 2 + QMIN( ow / 6, sz / 2 ) && py <= oy + QMIN( oh / 3, sz ) ) { _modType = MT_RESIZE_UP; return Qt::sizeVerCursor; } - if ( px >= ox + ow / 2 - 3 && py >= oy + oh - 6 && px <= ox + ow / 2 + 3 && py <= oy + oh ) + if ( px >= ox + ow / 2 - QMIN( ow / 6, sz / 2 ) && py >= oy + oh - QMIN( oh / 3, sz ) && px <= ox + ow / 2 + QMIN( ow / 6, sz / 2 ) && py <= oy + oh ) { _modType = MT_RESIZE_DN; return Qt::sizeVerCursor; } - if ( px >= ox + ow - 6 && py >= oy && px <= ox + ow && py <= oy + 6 ) + if ( px >= ox + ow - QMIN( ow / 3, sz ) && py >= oy && px <= ox + ow && py <= oy + QMIN( oh / 3, sz) ) { _modType = MT_RESIZE_RU; return Qt::sizeBDiagCursor; } - if ( px >= ox + ow - 6 && py >= oy + oh / 2 - 3 && px <= ox + ow && py <= oy + oh / 2 + 3 ) + if ( px >= ox + ow - QMIN( ow / 3, sz ) && py >= oy + oh / 2 - QMIN( oh / 6, sz / 2 ) && px <= ox + ow && py <= oy + oh / 2 + QMIN( oh / 6, sz / 2) ) { _modType = MT_RESIZE_RT; return Qt::sizeHorCursor; } - if ( px >= ox + ow - 6 && py >= oy + oh - 6 && px <= ox + ow && py <= oy + oh ) + if ( px >= ox + ow - QMIN( ow / 3, sz ) && py >= oy + oh - QMIN( oh / 3, sz) && px <= ox + ow && py <= oy + oh ) { _modType = MT_RESIZE_RD; return Qt::sizeFDiagCursor; --------------Boundary-00=_27FILGWQGA2S7T4SRDFZ-- ____________________________________ koffice mailing list koffice@mail.kde.org To unsubscribe please visit: http://mail.kde.org/mailman/listinfo/koffice