rubberband fix

3 files changed, 22 insertions, 6 deletions

diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 7927307..8ee1363 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -767,13 +767,13 @@ int MonthViewCell::insertEvent(Event *event)
             ++mdayCount;
         } else {
             uint i;
             int pos = mdayCount;
             for ( i = mdayCount; i < count();++i ) {
                 QListBoxItem* it = this->item ( i );
-                if ( text < it->text() ) {
+                if ( it && text < it->text() ) {
                     pos = i;
                     break;
                 }
                 ++pos;
             }
             insertItem( item ,pos);
diff --git a/microkde/KDGanttMinimizeSplitter.cpp b/microkde/KDGanttMinimizeSplitter.cpp
index fb5d4e3..72c4e60 100644
--- a/microkde/KDGanttMinimizeSplitter.cpp
+++ b/microkde/KDGanttMinimizeSplitter.cpp
@@ -49,24 +49,37 @@
 #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 )
 {
 
@@ -186,14 +199,16 @@ void KDGanttSplitterHandle::mouseReleaseEvent( QMouseEvent *e )
             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();
@@ -678,13 +693,13 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
         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????
diff --git a/microkde/KDGanttMinimizeSplitter.h b/microkde/KDGanttMinimizeSplitter.h
index 585298d..3042e0a 100644
--- a/microkde/KDGanttMinimizeSplitter.h
+++ b/microkde/KDGanttMinimizeSplitter.h
@@ -40,12 +40,13 @@
 #endif // QT_H
 
 #ifndef QT_NO_SPLITTER___
 class QSplitterData;
 class QSplitterLayoutStruct;
 class KDGanttSplitterHandle;
+class KDRubberBand; 
 class KDGanttMinimizeSplitter : public QFrame
 {
     Q_OBJECT
     //  Q_ENUMS( Direction )
     // Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
     // Q_PROPERTY( Direction minimizeDirection READ minimizeDirection WRITE setMinimizeDirection )
@@ -77,13 +78,13 @@ public:
     QSize minimumSizeHint() const;
 
     QValueList<int> sizes() const;
     void setSizes( QValueList<int> );
     KDGanttSplitterHandle* firstHandle(){ return mFirstHandle;}
     void expandPos( int id, int* min, int* max );
-    QFrame* rubberBand() { return mRubberBand ;}
+    KDRubberBand* rubberBand() { return mRubberBand ;}
 public slots:
      void toggle();
 protected:
     void childEvent( QChildEvent * );
 
     bool event( QEvent * );
@@ -97,13 +98,13 @@ protected:
     void styleChange( QStyle& );
     int adjustPos( int , int );
     virtual void setRubberband( int );
     void getRange( int id, int*, int* );
 
 private:
-    QFrame* mRubberBand;
+    KDRubberBand* mRubberBand;
     void init();
     void recalc( bool update = FALSE );
     void doResize();
     void storeSizes();
     void processChildEvents();
     QSplitterLayoutStruct *addWidget( QWidget*, bool first = FALSE );