author | zautrix <zautrix> | 2005-04-01 14:41:00 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-01 14:41:00 (UTC) |
commit | e5ec0ef6a256b96a758815ef861526f53d1ad7a5 (patch) (unidiff) | |
tree | 3fa188da9108c867c1437157731c7b7a3d4e641d /korganizer/kodaymatrix.cpp | |
parent | 93003b1f8348f112648d3cc20acb21b062220e21 (diff) | |
download | kdepimpi-e5ec0ef6a256b96a758815ef861526f53d1ad7a5.zip kdepimpi-e5ec0ef6a256b96a758815ef861526f53d1ad7a5.tar.gz kdepimpi-e5ec0ef6a256b96a758815ef861526f53d1ad7a5.tar.bz2 |
fix
-rw-r--r-- | korganizer/kodaymatrix.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index d543aaf..dfc6af7 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -107,12 +107,13 @@ KODayMatrix::KODayMatrix( QWidget *parent, const char *name ) | |||
107 | 107 | ||
108 | #if 0 | 108 | #if 0 |
109 | KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const char *name) : | 109 | KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const char *name) : |
110 | QFrame(parent, name) | 110 | QFrame(parent, name) |
111 | #endif | 111 | #endif |
112 | { | 112 | { |
113 | mRedrawNeeded = true; | ||
113 | mKODaymatrixWhatsThis = new KODaymatrixWhatsThis(this); | 114 | mKODaymatrixWhatsThis = new KODaymatrixWhatsThis(this); |
114 | mPendingUpdateBeforeRepaint = false; | 115 | mPendingUpdateBeforeRepaint = false; |
115 | mouseDown = false; | 116 | mouseDown = false; |
116 | // initialize dynamic arrays | 117 | // initialize dynamic arrays |
117 | bDays.resize ( NUMDAYS ); | 118 | bDays.resize ( NUMDAYS ); |
118 | hDays.resize ( NUMDAYS );; | 119 | hDays.resize ( NUMDAYS );; |
@@ -383,12 +384,13 @@ void KODayMatrix::updateViewTimed() | |||
383 | !holiStr.isEmpty()) { | 384 | !holiStr.isEmpty()) { |
384 | mHolidays[i] = holiStr; | 385 | mHolidays[i] = holiStr; |
385 | } else { | 386 | } else { |
386 | mHolidays[i] = QString::null; | 387 | mHolidays[i] = QString::null; |
387 | } | 388 | } |
388 | } | 389 | } |
390 | mRedrawNeeded = true; | ||
389 | if ( ! mPendingUpdateBeforeRepaint ) | 391 | if ( ! mPendingUpdateBeforeRepaint ) |
390 | repaint(false); | 392 | repaint(false); |
391 | } | 393 | } |
392 | void KODayMatrix::updateView(QDate actdate) | 394 | void KODayMatrix::updateView(QDate actdate) |
393 | { | 395 | { |
394 | 396 | ||
@@ -417,21 +419,22 @@ void KODayMatrix::updateView(QDate actdate) | |||
417 | mSelEnd = mSelEnd + tmp; | 419 | mSelEnd = mSelEnd + tmp; |
418 | } | 420 | } |
419 | } | 421 | } |
420 | startdate = actdate; | 422 | startdate = actdate; |
421 | mDayChanged = true; | 423 | mDayChanged = true; |
422 | recalculateToday(); | 424 | recalculateToday(); |
425 | mRedrawNeeded = true; | ||
423 | } | 426 | } |
424 | //qDebug("restart Timer %d vis: %d", mDayChanged, isVisible() ); | 427 | //qDebug("restart Timer %d vis: %d", mDayChanged, isVisible() ); |
425 | if ( !isVisible() ) { | 428 | if ( !isVisible() ) { |
426 | mPendingUpdateBeforeRepaint = true; | 429 | mPendingUpdateBeforeRepaint = true; |
427 | } else { | 430 | } else { |
428 | #ifdef DESKTOP_VERSION | 431 | #ifdef DESKTOP_VERSION |
429 | //mRepaintTimer->start( 100 ); | 432 | //mRepaintTimer->start( 100 ); |
430 | //updateViewTimed(); | 433 | //updateViewTimed(); |
431 | mUpdateTimer->start( 20 ); | 434 | mUpdateTimer->start( 50 ); |
432 | #else | 435 | #else |
433 | mRepaintTimer->start( 350 ); | 436 | mRepaintTimer->start( 350 ); |
434 | mUpdateTimer->start( 1200 ); | 437 | mUpdateTimer->start( 1200 ); |
435 | #endif | 438 | #endif |
436 | } | 439 | } |
437 | } | 440 | } |
@@ -675,13 +678,17 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) | |||
675 | if ( mPendingUpdateBeforeRepaint ) { | 678 | if ( mPendingUpdateBeforeRepaint ) { |
676 | updateViewTimed(); | 679 | updateViewTimed(); |
677 | mPendingUpdateBeforeRepaint = false; | 680 | mPendingUpdateBeforeRepaint = false; |
678 | } | 681 | } |
679 | if ( myPix.width() != width() || myPix.height()!=height() ) { | 682 | if ( myPix.width() != width() || myPix.height()!=height() ) { |
680 | myPix.resize(size() ); | 683 | myPix.resize(size() ); |
684 | mRedrawNeeded = true; | ||
681 | } | 685 | } |
686 | |||
687 | if ( mRedrawNeeded ) { | ||
688 | //qDebug("REDRAW "); | ||
682 | QPainter p(&myPix); | 689 | QPainter p(&myPix); |
683 | p.setFont(font()); | 690 | p.setFont(font()); |
684 | 691 | ||
685 | 692 | ||
686 | int dheight = daysize.height(); | 693 | int dheight = daysize.height(); |
687 | int dwidth = daysize.width(); | 694 | int dwidth = daysize.width(); |
@@ -924,15 +931,17 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) | |||
924 | if ( eDays.testBit(i)) { | 931 | if ( eDays.testBit(i)) { |
925 | QFont myFont = font(); | 932 | QFont myFont = font(); |
926 | myFont.setBold(false); | 933 | myFont.setBold(false); |
927 | p.setFont(myFont); | 934 | p.setFont(myFont); |
928 | } | 935 | } |
929 | } | 936 | } |
930 | int off = 0;//xyOff; | 937 | } else { |
931 | bitBlt (this, off, off, &myPix, 0 ,0,width(), height() ,CopyROP); | 938 | //qDebug("NO redraw "); |
932 | //qDebug("ffffffffff %d ", off); | 939 | } |
940 | bitBlt (this, 0, 0, &myPix, 0 ,0,width(), height() ,CopyROP); | ||
941 | mRedrawNeeded = false; | ||
933 | } | 942 | } |
934 | 943 | ||
935 | // ---------------------------------------------------------------------------- | 944 | // ---------------------------------------------------------------------------- |
936 | // R E SI Z E E V E N T H A N D L I N G | 945 | // R E SI Z E E V E N T H A N D L I N G |
937 | // ---------------------------------------------------------------------------- | 946 | // ---------------------------------------------------------------------------- |
938 | 947 | ||