fix

3 files changed, 33 insertions, 25 deletions

diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index 9720146..ba97fa6 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -42,16 +42,19 @@ DateNavigatorContainer::DateNavigatorContainer( QWidget *parent,
 {
   mExtraViews.setAutoDelete( true );
 
   mNavigatorView = new KDateNavigator( this, name );
 
   connectNavigatorView( mNavigatorView );
   //setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding)   ); 
   mLastDisplayedDN = 0;
+  mUpdateTimer; 
+  mUpdateTimer = new QTimer( this );
+  connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( checkUpdateDayMatrixDates() ));
 }
 
 DateNavigatorContainer::~DateNavigatorContainer()
 {
 }
 
 void DateNavigatorContainer::connectNavigatorView( KDateNavigator *v )
 {
@@ -130,19 +133,34 @@ void DateNavigatorContainer::setCalendar( Calendar *cal )
 {
   mCalendar = cal;
   mNavigatorView->setCalendar( cal );
   for( uint i = 0; i < mLastDisplayedDN; ++i ) {
       KDateNavigator *n = mExtraViews.at( i );
       n->setCalendar( cal );
   }
 }
+void DateNavigatorContainer::checkUpdateDayMatrixDates()
+{
+    QDate last = lastAvailableDate();
+    QDate first = firstAvailableDate();
+
+    QDate selFirst = mFirstSelectedDate;
+    QDate selLast = selFirst.addDays( mSelectedDateCount-1 );
+    if ( selFirst >= first && selLast <= last ) {
+        updateDayMatrixDates();
+    }
+    else {
+        updateDayMatrixDates();
+        emit monthSelected( mFirstSelectedDate.month() );
+    }
+}
 void DateNavigatorContainer::updateDayMatrixDates()
 { 
-
+    mUpdateTimer->stop();
     QDate fDate =  mFirstSelectedDate;
     QDate lDate =  fDate.addDays( mSelectedDateCount - 1 );
     mNavigatorView->dayMatrix()->setSelectedDaysFrom( fDate , lDate );
     mNavigatorView->dayMatrix()->repaint( false );
     for( uint i = 0; i < mLastDisplayedDN; ++i ) {
         KDateNavigator *n = mExtraViews.at( i );
         if ( n->dayMatrix()->setSelectedDaysFrom( fDate , lDate ) ) {
             n->dayMatrix()->repaint( false );
@@ -213,30 +231,16 @@ void DateNavigatorContainer::selectDates( const DateList &dateList )
     mFirstSelectedDate = dateList.first() ;
     mSelectedDateCount = dateList.count() ;
     if ( !mLastDisplayedDN ) {
         mNavigatorView->selectDates( dateList );
         return;
     } 
     QDate fDate =  dateList.first();
     QDate lDate =  dateList.last();
-    if ( mLastDisplayedDN <= 2  ) {
-        mNavigatorView->selectDates( dateList );
-        KDateNavigator *view = mExtraViews.at( 0 );
-        QDate bDate = fDate.addDays( fDate.daysInMonth () - fDate.day() +1 );
-        view->setBaseDate( bDate, false );
-        view->dayMatrix()->setSelectedDaysFrom(fDate , lDate);
-        if ( mLastDisplayedDN == 2  ) {
-            view = mExtraViews.at( 1 );
-            bDate = bDate.addDays( bDate.daysInMonth () - bDate.day() +1 );
-            view->setBaseDate( bDate, false );
-            view->dayMatrix()->setSelectedDaysFrom(fDate , lDate);
-        }
-        return;
-    }
     //qDebug("%s %s  ", lastAvailableDate().toString().latin1(), firstAvailableDate().toString().latin1()  );
     //qDebug("End %s %s ",lDate.toString().latin1(),curEnd.toString().latin1()  );
     if ( lDate <= lastAvailableDate() && firstAvailableDate() <=  fDate) {
         updateDayMatrixDates();
         return;
     }
     mNavigatorView->selectDates( dateList );
     setBaseDates();
@@ -367,16 +371,17 @@ void DateNavigatorContainer::resizeEvent( QResizeEvent * e )
     if ( y > 0 ) bar->showButtons( false, false );
     else {
         if ( x + 1 == horizontalCount ) bar->showButtons( false, true );
         else bar->showButtons( false, false );
     }
     view->setGeometry( x * width,
         y * height, width, height );
   }
+  mUpdateTimer->start( 250 );
   //updateDayMatrixDates();
 }
 
 QSize DateNavigatorContainer::minimumSizeHint() const
 {
   return mNavigatorView->minimumSizeHint();
 }
 
diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h
index d5e5adf..df8efae 100644
--- a/korganizer/datenavigatorcontainer.h
+++ b/korganizer/datenavigatorcontainer.h
@@ -50,16 +50,17 @@ class DateNavigatorContainer: public QWidget
     QDate firstAvailableDate() const ;
 
   public slots:
     void selectDates( const KCal::DateList & );
     void updateView();
     void updateConfig();
     void updateDayMatrix();
     void updateDayMatrixDates();
+    void checkUpdateDayMatrixDates();
     void updateToday();
     void slotMonthSelected( int month );
 
   signals:
     void datesSelected( const KCal::DateList & );
     void incidenceDropped( Incidence *, const QDate & );
     void incidenceDroppedMove( Incidence *, const QDate & );
     void weekClicked( const QDate &);
@@ -76,16 +77,17 @@ class DateNavigatorContainer: public QWidget
 
   protected:
     void resizeEvent( QResizeEvent * );
 
     void setBaseDates();
     void connectNavigatorView( KDateNavigator *v );
 
   private:
+    QTimer* mUpdateTimer;
     int mLastDisplayedDN;
     QDate mFirstSelectedDate;
     int mSelectedDateCount;
     KDateNavigator *mNavigatorView;
 
     KCal::Calendar *mCalendar;
 
     QPtrList<KDateNavigator> mExtraViews;
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 366e8b8..59618bf 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -655,45 +655,45 @@ void KODayMatrix::dropEvent(QDropEvent *e)
 }
 
 // ----------------------------------------------------------------------------
 //  P A I N T   E V E N T   H A N D L I N G
 // ----------------------------------------------------------------------------
 
 void KODayMatrix::paintEvent(QPaintEvent * pevent)
 {
-  QRect sz = frameRect();
-    if ( sz.width() <= 0  || sz.height() <= 0 )
+  
+    if ( width() <= 0  || height() <= 0 )
         return;
     if ( mPendingUpdateBeforeRepaint ) {
         updateViewTimed();
         mPendingUpdateBeforeRepaint = false;
     }
-    if ( myPix.width() != sz.width() || myPix.height()!=sz.height() ) {
-        myPix.resize(sz.size() );
+    if ( myPix.width() != width() || myPix.height()!=height() ) {
+        myPix.resize(size() );
     }
   QPainter p(&myPix);
   p.setFont(font());
 
 
   int dheight = daysize.height();
   int dwidth = daysize.width();
   int row,col;
   int selw, selh;
   int xyOff = frameWidth();
-  int colModulo = sz.width()  % 7;
-  int rowModulo = sz.height()  % 6;
+  int colModulo = (width()-2)  % 7;
+  int rowModulo = (height()-2)  % 6;
   //qDebug("col %d  row %d ",colModulo,rowModulo  );
   
   bool isRTL = KOGlobals::self()->reverseLayout();
 
   // draw background and topleft frame
-  p.fillRect(pevent->rect(), mDefaultBackColor);
+  p.fillRect(0,0,width(),height(), mDefaultBackColor);
   p.setPen(mDefaultTextColor);
-  p.drawRect(0, 0, sz.width()+1, sz.height()+1);
+  p.drawRect(0, 0, width(), height());
   int mSelStartT = mSelStart;
   int mSelEndT = mSelEnd;
   if ( mSelEndT >=  NUMDAYS )
       mSelEndT = NUMDAYS-1;
   // draw selected days with highlighted background color
   if (mSelStart != NOSELECTION) {
       bool skip = false;
       if ( ! mouseDown ) {
@@ -758,17 +758,18 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
                       addCol2 =  col - 7 + colModulo;
               }
               if ( rowModulo ) {
                   if ( row >= 6 - rowModulo )
                       addRow = row - 5 + rowModulo;
               }  
               if ( row == 0)
                   addRow = 1; 
-              p.fillRect(isRTL ? 0 : col*dwidth+1+addCol2, row*dheight+addRow, (7-col)*dwidth+colModulo,
+              int drawWid = width()-(col*dwidth+1+addCol2)-1;
+              p.fillRect(isRTL ? 0 : col*dwidth+1+addCol2, row*dheight+addRow, drawWid,
                          dheight+1, selcol);
               // draw full block till last line
               selh = mSelEndT/7-row; 
               addRow = 0;
               if ( rowModulo ) {
                   if ( mSelEndT/7 >= 6 - rowModulo )
                       addRow = mSelEndT/7 - 5 + rowModulo;
               }  
@@ -909,17 +910,17 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
       }
       // reset bold font to plain font
       if (events[i] > 0) {
           QFont myFont = font();
           myFont.setBold(false);
           p.setFont(myFont);
       }
   }
-  int off = xyOff;
+  int off = 0;//xyOff;
     bitBlt (this, off, off, &myPix, 0 ,0,width(), height() ,CopyROP); 
     //qDebug("ffffffffff %d ", off);
 }
 
 // ----------------------------------------------------------------------------
 //  R E SI Z E   E V E N T   H A N D L I N G
 // ----------------------------------------------------------------------------