next pix wech

3 files changed, 10 insertions, 15 deletions

diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 9fe1be4..abb29f7 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -339,30 +339,33 @@ void KOAgendaItem::repaintMe( )
 }
 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() );
+    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 )
         paint = &pa;
     bool horLayout = ( w < h );
@@ -465,17 +468,16 @@ 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 ) {
         int w = QApplication::desktop()->width();
         int h = QApplication::desktop()->height();
@@ -488,26 +490,17 @@ QPixmap * KOAgendaItem::paintPixAllday()
     static QPixmap* mPaintPixA = 0;
     if ( ! mPaintPixA ) {
         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 )
       return;
     int yy;
@@ -522,27 +515,30 @@ void KOAgendaItem::paintEvent ( QPaintEvent *e )
         xPaintCoord= xx;
         yPaintCoord = yy;
         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();
     }
     xx += rx;
 
diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h
index dc2316a..7103abe 100644
--- a/korganizer/koagendaitem.h
+++ b/korganizer/koagendaitem.h
@@ -98,17 +98,16 @@ class KOAgendaItem : public QWidget
     
     QPtrList<KOAgendaItem> conflictItems();
     void setConflictItems(QPtrList<KOAgendaItem>);
     void addConflictItem(KOAgendaItem *ci);
     void paintMe( bool, QPainter* painter = 0 );
     void repaintMe();
     static void resizePixmap( int, int );
     static QPixmap * paintPix();
-    static QPixmap * paintPixSel();
     static QPixmap * paintPixAllday();
     void updateItem();
     void computeText();
     void recreateIncidence();
     bool checkLayout();
     void initColor ();
   public slots:
     bool updateIcons( QPainter *, bool );
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 5a63b35..f811fba 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -598,17 +598,17 @@ void KOAgendaView::categoryChanged(Incidence * inc)
     mAgenda->categoryChanged( inc );
     mAllDayAgenda->categoryChanged( inc );
 }
 KOAgendaView::~KOAgendaView()
 {
     delete mAllAgendaPopup;
     //delete mAllDayAgendaPopup;
     delete KOAgendaItem::paintPix();
-    delete KOAgendaItem::paintPixSel();
+    delete KOAgendaItem::paintPixAllday();
 }
 void KOAgendaView::resizeEvent( QResizeEvent* e )
 {
     //qDebug("KOAgendaView::resizeEvent( QResizeEvent* e ) %d ", e->size().width());
     bool uc = false;
     int ow =  e->oldSize().width();
     int oh =  e->oldSize().height();
     int w = e->size().width();