summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagenda.cpp14
-rw-r--r--korganizer/koagenda.h1
-rw-r--r--korganizer/koagendaview.cpp2
3 files changed, 12 insertions, 5 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 7e9fa71..7d9d674 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -106,13 +106,14 @@ int MarcusBains::todayColumn()
}
return -1;
}
void MarcusBains::updateLoc()
{
- updateLocation();
+ if ( !agenda->invalidPixmap() )
+ updateLocation();
}
void MarcusBains::updateLocation(bool recalculate)
{
QTime tim = QTime::currentTime();
//qDebug(" MarcusBains::updateLocation %s ", tim.toString().latin1());
@@ -438,18 +439,22 @@ void KOAgenda::categoryChanged(Incidence * inc)
if ( item->incidence() == inc ) {
item->initColor ();
item->updateItem();
}
}
}
+bool KOAgenda::invalidPixmap()
+{
+ return mInvalidPixmap;
+}
bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
{
if ( mInvalidPixmap ) {
mInvalidPixmap = false;
- qDebug("KO: Upsizing Pixmaps ");
+ qDebug("KO: efm Upsizing Pixmaps %s", QDateTime::currentDateTime().toString().latin1());
computeSizes();
emit updateViewSignal();
return true;
}
emit sendPing();
static int startX = 0;
@@ -1278,17 +1283,18 @@ void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
{
if ( globalFlagBlockAgenda )
return;
if ( mInvalidPixmap ) {
mInvalidPixmap = false;
- qDebug("KO: Upsizing Pixmaps ");
+ qDebug("KO: dc Upsizing Pixmaps %s", QDateTime::currentDateTime().toString().latin1());
computeSizes();
emit updateViewSignal();
return;
- }
+ }
+ //qDebug("KOAgenda::drawContents %s", QDateTime::currentDateTime().toString().latin1());
if ( ! mAllDayMode ) {
// currently not working for
//qDebug("KOAgenda::drawContents ");
#if 0
if ( mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() ) {
diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h
index 59e7472..380ce62 100644
--- a/korganizer/koagenda.h
+++ b/korganizer/koagenda.h
@@ -125,12 +125,13 @@ class KOAgenda : public QScrollView
void printSelection();
void storePosition();
void restorePosition();
void setPopup( KOEventPopupMenu * p ) { mAllAgendaPopup = p; }
void shrinkPixmap();
QTime getEndTime();
+ bool invalidPixmap();
public slots:
void slotContentMove(int,int);
void categoryChanged(Incidence * inc);
void slotClearSelection();
void popupMenu();
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 04f30bb..f5a3a4b 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -600,13 +600,13 @@ void KOAgendaView::slotIdleTimeout()
// we do nothing if we wake up from a suspend
if ( secsfromstart > IDLETIMEOUT + 30 && isActice ) {
qDebug("KO: Wakeup from suspend ");
startIdleTimeout();
return;
}
- qDebug("KO: Downsizing Pixmaps ");
+ qDebug("KO: Downsizing Pixmaps %s",QDateTime::currentDateTime().toString().latin1());
mAgenda->shrinkPixmap();
mAllDayAgenda->shrinkPixmap();
KOAgendaItem::paintPix()->resize( 20,20);
KOAgendaItem::paintPixAllday()->resize( 20,20);
#endif