rubberband fix

1 files changed, 18 insertions, 3 deletions

diff --git a/microkde/KDGanttMinimizeSplitter.cpp b/microkde/KDGanttMinimizeSplitter.cpp
index fb5d4e3..72c4e60 100644
--- a/microkde/KDGanttMinimizeSplitter.cpp
+++ b/microkde/KDGanttMinimizeSplitter.cpp
@@ -43,36 +43,49 @@
 #else
 #include <qlist.h>
 #include <qarray.h>
 #define QPtrList QList
 #define QMemArray QArray
 #endif
 #include "qlayoutengine_p.h"
 #include "qobjectlist.h"
 #include "qstyle.h"
 #include "qapplication.h" //sendPostedEvents
 #include <qvaluelist.h>
 #include <qcursor.h>
+#include <qframe.h>
 #ifndef KDGANTT_MASTER_CVS
 //#include "KDGanttMinimizeSplitter.moc"
 #endif
 
 
 
 #ifndef DOXYGEN_SKIP_INTERNAL
 
 #if QT_VERSION >= 232
 static int mouseOffset;
 static int opaqueOldPos = -1; //### there's only one mouse, but this is a bit risky
 
+class KDRubberBand: public QFrame
+{
+public:
+    KDRubberBand(  QWidget *parent, const char * name, WFlags f ) :QFrame ( parent, name, f ) {;}
+
+protected:
+    virtual void mousePressEvent ( QMouseEvent * )
+    {
+        close();
+    };
+
+};
 
 KDGanttSplitterHandle::KDGanttSplitterHandle( Qt::Orientation o,
                                   KDGanttMinimizeSplitter *parent, const char * name )
     : QWidget( parent, name ), _activeButton( 0 ), _collapsed( false )
 {
 
     if ( QApplication::desktop()->width() > 320 &&  QApplication::desktop()->width() < 650 ) {
         mSizeHint = QSize(7,7);
         mUseOffset = true;
     } else {
         mSizeHint = QSize(6,6);
         mUseOffset = false;
@@ -180,26 +193,28 @@ void KDGanttSplitterHandle::mouseReleaseEvent( QMouseEvent *e )
         }
         _activeButton = 0;
         updateCursor( e->pos() );
     }
     else {
         if ( !opaque() && e->button() == LeftButton ) {
             QCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos()))
                 - mouseOffset;
             s->setRubberband( -1 );
             s->moveSplitter( pos, id() );
         }
     }
-    if ( s->rubberBand() )
-        s->rubberBand()->hide();
+    if ( s->rubberBand() ) {
+        //qDebug("hide rubberband ");
+        s->rubberBand()->close();
+    }
     repaint();
 }
 
 int KDGanttSplitterHandle::onButton( const QPoint& p )
 {
     QValueList<QPointArray> list = buttonRegions();
     int index = 1;
     int add = 12;
     for( QValueList<QPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) {
         QRect rect = (*it).boundingRect();
         rect.setLeft( rect.left()- add );
         rect.setRight( rect.right() + add);
@@ -672,25 +687,25 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
         if ( p >= 0 )
             paint.drawRect( p  + sw/2 - rBord, r.y(), 2*rBord, r.height() );
     } else {
         if ( opaqueOldPos >= 0 )
             paint.drawRect( r.x(), opaqueOldPos + sw/2 - rBord,
                             r.width(), 2*rBord );
         if ( p >= 0 )
             paint.drawRect( r.x(), p + sw/2 - rBord, r.width(), 2*rBord );
     }
     opaqueOldPos = p;
 #else 
     if ( !mRubberBand  ) {
-        mRubberBand = new QFrame( 0, "rubber", WStyle_NoBorder | WStyle_Customize | WStyle_StaysOnTop);
+        mRubberBand = new KDRubberBand( 0, "rubber", WStyle_NoBorder | WStyle_Customize | WStyle_StaysOnTop);
         mRubberBand->setFrameStyle( Box | Raised );
         //mRubberBand->setPalette( QPalette ( Qt::red.light(),Qt::red.dark() ) );
         mRubberBand->setPalette( QPalette ( colorGroup().background().light(), colorGroup().background().dark() ));
     }
     QRect r = contentsRect();
     static int rBord = 0; //Themable????
     if ( !rBord ) {
         if (QApplication::desktop()->width() <= 320 )
             rBord = 3;
         else
             rBord = 4;
     }