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
@@ -770,7 +770,7 @@ int MonthViewCell::insertEvent(Event *event)
             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;
                 }
diff --git a/microkde/KDGanttMinimizeSplitter.cpp b/microkde/KDGanttMinimizeSplitter.cpp
index fb5d4e3..72c4e60 100644
--- a/microkde/KDGanttMinimizeSplitter.cpp
+++ b/microkde/KDGanttMinimizeSplitter.cpp
@@ -52,6 +52,7 @@
 #include "qapplication.h" //sendPostedEvents
 #include <qvaluelist.h>
 #include <qcursor.h>
+#include <qframe.h>
 #ifndef KDGANTT_MASTER_CVS
 //#include "KDGanttMinimizeSplitter.moc"
 #endif
@@ -64,6 +65,18 @@
 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 )
@@ -189,8 +202,10 @@ void KDGanttSplitterHandle::mouseReleaseEvent( QMouseEvent *e )
             s->moveSplitter( pos, id() );
         }
     }
-    if ( s->rubberBand() )
-        s->rubberBand()->hide();
+    if ( s->rubberBand() ) {
+        //qDebug("hide rubberband ");
+        s->rubberBand()->close();
+    }
     repaint();
 }
 
@@ -681,7 +696,7 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
     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() ));
diff --git a/microkde/KDGanttMinimizeSplitter.h b/microkde/KDGanttMinimizeSplitter.h
index 585298d..3042e0a 100644
--- a/microkde/KDGanttMinimizeSplitter.h
+++ b/microkde/KDGanttMinimizeSplitter.h
@@ -43,6 +43,7 @@
 class QSplitterData;
 class QSplitterLayoutStruct;
 class KDGanttSplitterHandle;
+class KDRubberBand; 
 class KDGanttMinimizeSplitter : public QFrame
 {
     Q_OBJECT
@@ -80,7 +81,7 @@ public:
     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:
@@ -100,7 +101,7 @@ protected:
     void getRange( int id, int*, int* );
 
 private:
-    QFrame* mRubberBand;
+    KDRubberBand* mRubberBand;
     void init();
     void recalc( bool update = FALSE );
     void doResize();