4 files changed, 26 insertions, 4 deletions

diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 2996acb..218396d 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -80,10 +80,12 @@ using namespace KOrg;
 
 TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,WFlags f) :
     QScrollView(parent,name,f)
 {
+    myPix.resize( 1, 1 );
     mRows = rows;
 
+    mRedrawNeeded = true;
     setMinimumHeight( 20 );
     mCellHeight = KOPrefs::instance()->mHourSize*4;
 
     enableClipper(true);
@@ -115,8 +117,9 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
     //       code assumes the latter...
 
     // now, for a workaround...
     // these two assignments fix the weird redraw bug
+    if ( mRedrawNeeded ) {
     cx = contentsX() + 2;
     cw = contentsWidth() - 2;
     // end of workaround
 
@@ -182,8 +185,14 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
         // increment indices
         y += mCellHeight;
         cell++;
     }
+    } else {
+        //qDebug("NO  redraw ");
+    }
+    // double buffer not yet implemented
+    //bitBlt (this, 0, 0, &myPix, 0 ,0,width(), height() ,CopyROP);
+    //mRedrawNeeded = false;
 }
 
 /**
    Calculates the minimum width.
@@ -195,8 +204,9 @@ int TimeLabels::minimumWidth() const
 
 /** updates widget's internal state */
 void TimeLabels::updateConfig()
 {
+    mRedrawNeeded = true;
     // set the font
     //  config->setGroup("Fonts");
     //  QFont font = config->readFontEntry("TimeBar Font");
     setFont(KOPrefs::instance()->mTimeBarFont);
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index 6dc81c6..30c9b05 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -100,8 +100,10 @@ class TimeLabels : public QScrollView {
   protected:
     void drawContents(QPainter *p,int cx, int cy, int cw, int ch);
 
   private:
+    QPixmap myPix;
+    bool mRedrawNeeded;
     int mMiniWidth;
     int mMouseDownY;
     QString mOrgCap;
     int mRows;
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index d543aaf..dfc6af7 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -109,8 +109,9 @@ KODayMatrix::KODayMatrix( QWidget *parent, const char *name )
 KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const char *name) :
   QFrame(parent, name)
 #endif
 {
+    mRedrawNeeded = true;
   mKODaymatrixWhatsThis =  new KODaymatrixWhatsThis(this);
   mPendingUpdateBeforeRepaint = false;
   mouseDown = false;
   // initialize dynamic arrays
@@ -385,8 +386,9 @@ void KODayMatrix::updateViewTimed()
         } else {
             mHolidays[i] = QString::null;
         }
     }
+    mRedrawNeeded = true;
     if ( ! mPendingUpdateBeforeRepaint )
         repaint(false);
 }
 void KODayMatrix::updateView(QDate actdate)
@@ -419,17 +421,18 @@ void KODayMatrix::updateView(QDate actdate)
         }
         startdate = actdate;
         mDayChanged = true;
         recalculateToday();
+        mRedrawNeeded = true;
     }
     //qDebug("restart Timer %d vis: %d", mDayChanged, isVisible() );
     if ( !isVisible() ) {
         mPendingUpdateBeforeRepaint = true; 
     } else {
 #ifdef DESKTOP_VERSION
         //mRepaintTimer->start( 100 );
         //updateViewTimed();
-     mUpdateTimer->start( 20 );
+     mUpdateTimer->start( 50 );
 #else
         mRepaintTimer->start( 350 ); 
         mUpdateTimer->start( 1200 );
 #endif
@@ -677,9 +680,13 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
         mPendingUpdateBeforeRepaint = false;
     }
     if ( myPix.width() != width() || myPix.height()!=height() ) {
         myPix.resize(size() );
+        mRedrawNeeded = true;
     }
+
+    if ( mRedrawNeeded ) {
+        //qDebug("REDRAW ");
   QPainter p(&myPix);
   p.setFont(font());
 
 
@@ -926,11 +933,13 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
           myFont.setBold(false);
           p.setFont(myFont);
       }
   }
-  int off = 0;//xyOff;
-    bitBlt (this, off, off, &myPix, 0 ,0,width(), height() ,CopyROP); 
-    //qDebug("ffffffffff %d ", off);
+    } else {
+        //qDebug("NO  redraw ");
+    }
+    bitBlt (this, 0, 0, &myPix, 0 ,0,width(), height() ,CopyROP);
+    mRedrawNeeded = false;
 }
 
 // ----------------------------------------------------------------------------
 //  R E SI Z E   E V E N T   H A N D L I N G
diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h
index 38a7f92..731117c 100644
--- a/korganizer/kodaymatrix.h
+++ b/korganizer/kodaymatrix.h
@@ -226,8 +226,9 @@ protected:
 
     void resizeEvent(QResizeEvent *);
 
 private:
+    bool mRedrawNeeded;
     KODaymatrixWhatsThis* mKODaymatrixWhatsThis;
     bool mouseDown;
     QBitArray bDays;
     QBitArray hDays;