| -rw-r--r-- | korganizer/datenavigatorcontainer.cpp | 6 | ||||
| -rw-r--r-- | korganizer/kdatenavigator.cpp | 2 | ||||
| -rw-r--r-- | korganizer/kodaymatrix.cpp | 32 | ||||
| -rw-r--r-- | korganizer/kodaymatrix.h | 1 |
4 files changed, 33 insertions, 8 deletions
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index 92abae6..e57daa4 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp @@ -425,3 +425,7 @@ void DateNavigatorContainer::resizeEvent( QResizeEvent * e ) else - mUpdateTimer->start( 250 ); +#ifdef DESKTOP_VERSION + mUpdateTimer->start( 100 ); +#else + mUpdateTimer->start( 50 ); +#endif diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 1d09f40..5aa1c9b 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp @@ -92,3 +92,3 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name ) weeknos[i] = new QLabel(this); - weeknos[i]->setAlignment(AlignCenter); + weeknos[i]->setAlignment(AlignCenter ); //weeknos[i]->setFont(QFont("Arial", 10)); diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 8affe50..c7e1b45 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -111,3 +111,6 @@ KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const #endif -{ +{ + oldW = 0; + oldH = 0; + myPix.resize( 150, 120 ); mRedrawNeeded = true; @@ -118,4 +121,4 @@ KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const bDays.resize ( NUMDAYS ); - hDays.resize ( NUMDAYS );; - eDays.resize ( NUMDAYS );; + hDays.resize ( NUMDAYS ); + eDays.resize ( NUMDAYS ); days = new QDate[NUMDAYS]; @@ -336,3 +339,7 @@ void KODayMatrix::updateView() void KODayMatrix::repaintViewTimed() -{ +{ + mRedrawNeeded = true; + bDays.fill( false); + hDays.fill( false); + eDays.fill( false); mRepaintTimer->stop(); @@ -685,2 +692,3 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) } +#if 0 if ( myPix.width() != width() || myPix.height()!=height() ) { @@ -689,3 +697,14 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) } - +#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 ) { @@ -949,3 +968,4 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) } - 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 @@ -229,2 +229,3 @@ protected: private: + int oldW, oldH; bool mRedrawNeeded; |