next pix wech

1 files changed, 10 insertions, 14 deletions

diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 9fe1be4..abb29f7 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -341,26 +341,29 @@ void KOAgendaItem::paintMe( bool selected, QPainter* paint )
 {    
     if ( globalFlagBlockAgendaItemUpdate && ! selected)
       return;
     QPainter pa;
     
     if ( mSelected ) {
-        pa.begin( paintPixSel() );
+        pa.begin( this );
     } else {
         if ( mAllDay )
             pa.begin( paintPixAllday() );
         else
             pa.begin( paintPix() );
     }
     int x, yy, w,  h;
     float nfh = 7.0;
     x = pos().x(); w = width(); h = height ();
     if ( mAllDay )
         yy = y();
     else
-        yy = mCellYTop * ( height() / cellHeight() );
+        yy = mCellYTop * ( height() / cellHeight() ); 
+    if ( mSelected ) {
+        pa.translate( -x, -yy );
+    } 
     xPaintCoord= x;
     yPaintCoord = yy;
     wPaintCoord = width();
     hPaintCoord = height();
     //qDebug("paintMe %s %d %d %d %d",incidence()->summary().latin1(), x, yy, width(), height());
     if ( paint == 0 )
@@ -467,13 +470,12 @@ void KOAgendaItem::paintMe( bool selected, QPainter* paint )
     pa.end();
  
 }
 void KOAgendaItem::resizePixmap( int w , int h )
 {
     paintPix()->resize( w, h ); 
-    paintPixSel()->resize( w, h ); 
 
 }
 QPixmap * KOAgendaItem::paintPix()
 {
     static QPixmap* mPaintPix = 0;
     if ( ! mPaintPix ) {
@@ -490,22 +492,13 @@ QPixmap * KOAgendaItem::paintPixAllday()
         int w = QApplication::desktop()->width();
         int h = QApplication::desktop()->height()/3;
         mPaintPixA = new QPixmap(w,h);
     }
     return mPaintPixA ; 
 }
-QPixmap * KOAgendaItem::paintPixSel()
-{
-    static QPixmap* mPaintPixSel = 0;
-    if ( ! mPaintPixSel ) {
-        int w = QApplication::desktop()->width();
-        int h = QApplication::desktop()->height();
-        mPaintPixSel = new QPixmap(w,h);
-    }
-    return mPaintPixSel ; 
-}
+
 void KOAgendaItem::paintEvent ( QPaintEvent *e )
 {  
 
     if ( globalFlagBlockAgendaItemPaint )
         return; 
     if ( globalFlagBlockAgenda > 0 &&  globalFlagBlockAgenda < 5 )
@@ -524,23 +517,26 @@ void KOAgendaItem::paintEvent ( QPaintEvent *e )
         wPaintCoord = width();
         hPaintCoord = height();
         globalFlagBlockAgendaItemUpdate = 0;
         paintMe( mSelected );
         //qDebug("calling paintMe ");
         globalFlagBlockAgendaItemUpdate = 1;
+        if ( mSelected )
+            return;
     }
     int rx, ry, rw, rh;
     rx =  e->rect().x();
     ry =  e->rect().y();
     rw =  e->rect().width();
     rh =  e->rect().height();
     //qDebug("   paintevent %s %d %d    %d  %d", mIncidence->summary().latin1(), x(), yy, width(), height()); 
 
     QPixmap* paintFrom ;
     if ( mSelected ) {
-        paintFrom =  paintPixSel();
+        paintMe( mSelected );
+        return;
     } else {
         if ( mAllDay )
             paintFrom =  paintPixAllday();
         else
             paintFrom =  paintPix();
     }