fixxx

1 files changed, 26 insertions, 9 deletions

diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index c339b57..662576f 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -51,25 +51,25 @@
 #include <libkcal/todo.h>
 
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #endif
 
 //extern bool globalFlagBlockPainting;
 extern int globalFlagBlockAgenda;
 extern int globalFlagBlockAgendaItemPaint;
 extern int globalFlagBlockAgendaItemUpdate;
 extern int globalFlagBlockStartup;
 
-bool KOAgenda::mInvalidPixmap = false;
+
 ////////////////////////////////////////////////////////////////////////////
 MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name)
     : QFrame(_agenda->viewport(),name), agenda(_agenda)
 {
     setLineWidth(0);
     setMargin(0);
     setBackgroundColor(Qt::red);
     minutes = new QTimer(this);
     connect(minutes, SIGNAL(timeout()), this, SLOT(updateLoc()));
     minutes->start(0, true);
     mTimeBox = new QLabel(this);
     mTimeBox->setAlignment(Qt::AlignRight | Qt::AlignBottom);
@@ -321,24 +321,25 @@ void KOAgenda::init()
   mPopupItem =  0; 
   mInvalidPixmap = false;
   
 }
 
 void KOAgenda::shrinkPixmap()
 {
     mPaintPixmap.resize( 20,20);
     mInvalidPixmap = true;
 }
 void KOAgenda::slotContentMove(int,int)
 {
+    emit sendPing(); 
     if ( mActionType == NOP )
         slotClearSelection(); 
     if ( mSelectedItem && !mActionItem ) {
         deselectItem();
         emit incidenceSelected( 0 );
     }
 }
 void KOAgenda::clear()
 {
   KOAgendaItem *item;
   for ( item=mItems.first(); item != 0; item=mItems.next() ) {
     mUnusedItems.append( item );
@@ -429,24 +430,33 @@ void KOAgenda::popupMenu()
 void KOAgenda::categoryChanged(Incidence * inc)
 {
     KOAgendaItem *item;
     for ( item=mItems.first(); item != 0; item=mItems.next() ) {
         if ( item->incidence() == inc ) {
             item->initColor ();
             item->updateItem();
         }
     }
 }
 bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
 {
+
+    if ( mInvalidPixmap ) {
+        mInvalidPixmap = false;
+        qDebug("InvalidPixmap ");
+        computeSizes();
+        emit updateViewSignal();
+        return true;
+    } 
+    emit sendPing(); 
     static int startX = 0;
     static int startY = 0;
     int blockmoveDist = ( QApplication::desktop()->width() < 480 ? 7 : 9 );
     static bool blockMoving = true;
 
     //qDebug("KOAgenda::eventFilter_mous ");
     if ( object == mNewItemPopup ) {
         //qDebug("mNewItemPopup ");
         if ( me->type() == QEvent::MouseButtonRelease ) {
             mNewItemPopup->removeEventFilter( this ); 
             int dX = me->globalPos().x() - mPopupPos.x();;
             if ( dX < 0   )
@@ -1258,34 +1268,38 @@ void KOAgenda::placeSubCells(KOAgendaItem *placeItem)
 //     }
 //     placeItem->updateItem();
 } 
 
 void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
 {
     if ( globalFlagBlockAgenda )
         return;
 
     if ( mInvalidPixmap ) {
         mInvalidPixmap = false;
         qDebug("InvalidPixmap ");
-        QTimer::singleShot( 0, this, SIGNAL( updateViewSignal() ));
+        computeSizes();
+        emit updateViewSignal();
         return;
     }
     if ( ! mAllDayMode ) {
         // currently not working for
    
         //qDebug("KOAgenda::drawContents ");
-        if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() )
-            ;//drawContentsToPainter();
-   
+#if 0
+        if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() ) {
+            qDebug("WAU ");
+            drawContentsToPainter();
+        }
+#endif
         QPaintDevice* pd = p->device();
         p->end();
         int vx, vy; 
         int selectionX = KOGlobals::self()->reverseLayout() ?
             (mColumns - 1 - mSelectionCellX) * mGridSpacingX : 
             mSelectionCellX * mGridSpacingX;
         contentsToViewport ( cx, cy, vx,vy); 
         //qDebug("  %d %d %d %d %d",  cx, cy, cw,ch,mGridSpacingX-1) ;
 
         if ( !(selectionX ==  cx &&  cy == mSelectionYTop  &&  cw ==mGridSpacingX && ch == mSelectionHeight ) ) {
             if ( mGridSpacingX == cw && mSelectionHeight > 0  &&  ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
                                                                     ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) ) {
@@ -1311,28 +1325,31 @@ void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
                 int offset = 0;
                 while ( hei > 0 ) {
                     int p_hei = 5;
                     if ( hei < 5 ) p_hei = hei;
                     hei -= 5;
                     bitBlt ( pd, vx+1, vy+offset, &mHighlightPixmap, 0, 0, mGridSpacingX-1, p_hei ,CopyROP); 
                     offset += 5;
                 }
             }     
         } 
         p->begin( pd );
     } else {
- 
-        if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() )
-            ;//drawContentsToPainter();
-   
+#if 0
+        qDebug("mCurPixWid  %d %d ",mCurPixWid, contentsWidth() );
+        if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() ) {
+            qDebug("WAUWAU ");
+            drawContentsToPainter();
+        }
+#endif
         QPaintDevice* pd = p->device();
         p->end();
         int vx, vy; 
         int selectionX = KOGlobals::self()->reverseLayout() ?
             (mColumns - 1 - mSelectionCellX) * mGridSpacingX : 
             mSelectionCellX * mGridSpacingX;
         contentsToViewport ( cx, cy, vx,vy); 
         // qDebug("  %d %d %d %d ",  cx, cy, cw,ch) ;
         if ( !(selectionX ==  cx &&  cy == mSelectionYTop  &&  cw ==mGridSpacingX && ch == mSelectionHeight ) )
             bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
     
         if ( mSelectionHeight > 0 ) {