| -rw-r--r-- | korganizer/datenavigatorcontainer.cpp | 6 | ||||
| -rw-r--r-- | korganizer/kdatenavigator.cpp | 0 | ||||
| -rw-r--r-- | korganizer/kodaymatrix.cpp | 26 | ||||
| -rw-r--r-- | korganizer/kodaymatrix.h | 1 |
4 files changed, 29 insertions, 4 deletions
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index 92abae6..e57daa4 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp @@ -424,5 +424,9 @@ void DateNavigatorContainer::resizeEvent( QResizeEvent * e ) } else - mUpdateTimer->start( 250 ); +#ifdef DESKTOP_VERSION + mUpdateTimer->start( 100 ); +#else + mUpdateTimer->start( 50 ); +#endif //updateDayMatrixDates(); diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 1d09f40..5aa1c9b 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 8affe50..c7e1b45 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -111,4 +111,7 @@ KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const #endif { + oldW = 0; + oldH = 0; + myPix.resize( 150, 120 ); mRedrawNeeded = true; mKODaymatrixWhatsThis = new KODaymatrixWhatsThis(this); @@ -117,6 +120,6 @@ KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const // initialize dynamic arrays bDays.resize ( NUMDAYS ); - hDays.resize ( NUMDAYS );; - eDays.resize ( NUMDAYS );; + hDays.resize ( NUMDAYS ); + eDays.resize ( NUMDAYS ); days = new QDate[NUMDAYS]; daylbls = new QString[NUMDAYS]; @@ -336,4 +339,8 @@ void KODayMatrix::updateView() void KODayMatrix::repaintViewTimed() { + mRedrawNeeded = true; + bDays.fill( false); + hDays.fill( false); + eDays.fill( false); mRepaintTimer->stop(); repaint(false); @@ -684,8 +691,20 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) mPendingUpdateBeforeRepaint = false; } +#if 0 if ( myPix.width() != width() || myPix.height()!=height() ) { myPix.resize(size() ); mRedrawNeeded = true; } +#endif + if ( oldW != width() || oldH !=height() ) + mRedrawNeeded = true; + + oldH = height() ; + oldW = width(); + if ( myPix.width() < width() || myPix.height() < height() ) { + myPix.resize(size() ); + mRedrawNeeded = true; + + } if ( mRedrawNeeded ) { @@ -948,5 +967,6 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) //qDebug("NO redraw "); } - bitBlt (this, 0, 0, &myPix, 0 ,0,width(), height() ,CopyROP); + + bitBlt (this, pevent->rect().topLeft(), &myPix , pevent->rect() ,CopyROP); mRedrawNeeded = false; } diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h index 731117c..d725ead 100644 --- a/korganizer/kodaymatrix.h +++ b/korganizer/kodaymatrix.h @@ -228,4 +228,5 @@ protected: private: + int oldW, oldH; bool mRedrawNeeded; KODaymatrixWhatsThis* mKODaymatrixWhatsThis; |