From d1982b1423417eb59c275bb09d4e3012a67ca086 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Sat, 09 Apr 2005 16:49:42 +0000
Subject: nf

---
(limited to 'korganizer/koagenda.cpp')

diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 148d914..18c506e 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -1363,83 +1363,73 @@ void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
 {
     if ( globalFlagBlockAgenda )
         return;
-    //qDebug("KOAgenda::drawContents ");
-    if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() )
-        ;//drawContentsToPainter();
+    if ( ! mAllDayMode ) {
+        // currently not working for
    
-    QPaintDevice* pd = p->device();
-    p->end();
-    int vx, vy; 
-    int selectionX = KOGlobals::self()->reverseLayout() ?
+        //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 %d",  cx, cy, cw,ch,mGridSpacingX-1) ;
+        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 ) ) ) {
+        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);
+                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();
+        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); 
+            }     
+        } 
+        p->begin( pd );
+    } else {
+ 
+        if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() )
+            ;//drawContentsToPainter();
    
-    QPaintDevice* pd = p->device();
-    p->end();
-    int vx, vy; 
-    int selectionX = KOGlobals::self()->reverseLayout() ?
+        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);
+        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 );
-        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 ( 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); 
+            }     
+        } 
+        p->begin( pd );
+    }
 
-#endif
 }
 
 void KOAgenda::finishUpdate()
@@ -1967,7 +1957,7 @@ void KOAgenda::finishResize ( )
 */
 void KOAgenda::resizeEvent ( QResizeEvent *ev )
 {
-   
+    mSelectionHeight = 0;
     mResizeTimer.start( 150 , true );
     computeSizes(); 
     return;
--
cgit v0.9.0.2