agenda fix

1 files changed, 51 insertions, 0 deletions

diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index b5d52d2..148d914 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -1371,12 +1371,55 @@ void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
     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 ) ) ) {
+            
+          int vxSel, vySel;
+        contentsToViewport ( selectionX, mSelectionYTop, vxSel,vySel); 
+        int off = mSelectionHeight;
+        if ( vySel < 0 )
+            off += vySel;
+        //qDebug("OFF %d %d %d", off,vySel, vy );  
+        bitBlt ( pd, vx, vy+off, &mPaintPixmap, cx, cy+off, cw , ch-off  ,CopyROP);
+        } else {
+            bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
+        }
+    }
+    if ( mSelectionHeight > 0 ) { 
+        //qDebug("----  %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );
+        if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
+             ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
+            contentsToViewport ( selectionX, mSelectionYTop, vx,vy); 
+            bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP); 
+        }     
+    } 
+    //qDebug("btbl ");  
+    p->begin( pd );
+    //qDebug("end "); 
+#if 0
+
+   if ( globalFlagBlockAgenda )
+        return;
+    //qDebug("KOAgenda::drawContents ");
+    if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() )
+        ;//drawContentsToPainter();
+   
+    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 ) { 
         //qDebug("----  %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );
@@ -1386,12 +1429,20 @@ void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
             bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP); 
         }     
     } 
     //qDebug("btbl ");  
     p->begin( pd );
     //qDebug("end "); 
+
+
+
+
+
+
+
+#endif
 }
 
 void KOAgenda::finishUpdate()
 {
 
     KOAgendaItem *item;