koa item resize crash fix

1 files changed, 21 insertions, 1 deletions

diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 5ee433a..7e6fa48 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -441,92 +441,112 @@ QPixmap * KOAgendaItem::paintPix()
     static QPixmap* mPaintPix = 0;
     if ( ! mPaintPix )
         mPaintPix = new QPixmap(1,1);
     return mPaintPix ; 
 }
 QPixmap * KOAgendaItem::paintPixAllday()
 {
     static QPixmap* mPaintPixA = 0;
     if ( ! mPaintPixA ) 
         mPaintPixA = new QPixmap(1,1);
     return mPaintPixA ; 
 }
 QPixmap * KOAgendaItem::paintPixSel()
 {
     static QPixmap* mPaintPixSel = 0;
     if ( ! mPaintPixSel )
         mPaintPixSel = new QPixmap(1,1);
     return mPaintPixSel ; 
 }
 void KOAgendaItem::paintEvent ( QPaintEvent *e )
 {  
 
     if ( globalFlagBlockAgendaItemPaint )
         return; 
     if ( globalFlagBlockAgenda > 0 &&  globalFlagBlockAgenda < 5 )
       return;
     int yy;
     if ( mAllDay )
         yy = y();
     else
         yy = mCellYTop * ( height() / cellHeight() );
     int xx = x();
+  
     if ( xPaintCoord != xx || yPaintCoord != yy || 
          wPaintCoord != width() ||  hPaintCoord != height()) {
         xPaintCoord= xx;
         yPaintCoord = yy;
         wPaintCoord = width();
         hPaintCoord = height();
         globalFlagBlockAgendaItemUpdate = 0;
         paintMe( mSelected );
         //qDebug("calling paintMe ");
         globalFlagBlockAgendaItemUpdate = 1;
     }
     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();
     } else {
         if ( mAllDay )
             paintFrom =  paintPixAllday();
         else
             paintFrom =  paintPix();
     }
-    bitBlt (this, rx, ry, paintFrom, x()+rx ,yPaintCoord+ry, rw, rh ,CopyROP); 
+    xx += rx;
+
+    if ( xx < 0 ) {
+        rw = rw + xx;
+        rx -= xx;
+        xx = 0;
+        if ( rw < 0 ) {
+            qDebug("KOAgendaItem::Width1 < 0. Returning ");
+            return;
+        }
+    }
+    if ( paintFrom->width() <   xx+rw ) {
+        rw =  paintFrom->width() - xx;
+        if ( rw < 0 ) {
+            qDebug("KOAgendaItem::Width2 < 0. Returning ");
+            return;
+        }
+    }
+    //qDebug("%d %d %d %d %d  %d %d",rx, ry, paintFrom, xx ,yPaintCoord+ry, rw, rh);
+    bitBlt (this, rx, ry, paintFrom, xx ,yPaintCoord+ry, rw, rh ,CopyROP); 
 }
 void KOAgendaItem::computeText()
 {
  
     mDisplayedText =  mIncidence->summary();
     if ( (mIncidence->type() == "Todo") ) {
         if ( static_cast<Todo*>(mIncidence)->hasDueDate() ) {
             if ( static_cast<Todo*>(mIncidence)->dtDue().date() < QDate::currentDate() )
                 mDisplayedText += i18n(" (") +KGlobal::locale()->formatDate((static_cast<Todo*>(mIncidence))->dtDue().date(), true)+")";
             else if ( !(mIncidence->doesFloat()))
                 mDisplayedText += i18n(" (") +KGlobal::locale()->formatTime((static_cast<Todo*>(mIncidence))->dtDue().time())+")";
         } 
     } else {
         if ( !(mIncidence->doesFloat()) &&  KOPrefs::instance()->mShowTimeInAgenda)
             mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtStart().time()) + "-" + KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtEnd().time()) ;
 
         if (  mAllDay ) {
             if ( mIncidence->dtStart().date().addDays(3) < mIncidence->dtEnd().date() ) {
                 mDisplayedText += ": " +KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtStart().date(), true) + " - " + KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtEnd().date(), true) ;
             }
         }
 
     }
     
     if ( !mIncidence->location().isEmpty() ) {
         if ( mAllDay )
             mDisplayedText += " (";
         else
             mDisplayedText += "\n(";
         mDisplayedText += mIncidence->location() +")";
     }