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

List:       koffice
Subject:    kpresenter patch
From:       Thorsten Zachmann <t.zachmann () zagge ! de>
Date:       2002-08-27 16:01:50
[Download RAW message or body]

Hello all

the attached patch solves the problem that objects which have only a 
minimumsice can't be moved. 

The attached patch makes this possible.

Is it ok to commit?

Thorsten


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

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;


____________________________________
koffice mailing list
koffice@mail.kde.org
To unsubscribe please visit:
http://mail.kde.org/mailman/listinfo/koffice

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