fix for the lonng agenda float fix

4 files changed, 8 insertions, 7 deletions

diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 796d633..d9d1283 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -1837,10 +1837,10 @@ KOAgendaItem *KOAgenda::insertAllDayItem (Incidence *event,QDate qd,int XBegin,i
     return 0;
   }
-
+   //qDebug("insertallday %s  -- %d  - %d ",qd.toString().latin1(), XBegin, XEnd );
   KOAgendaItem *agendaItem = getNewItem(event,qd,viewport());
 
   agendaItem->setCellXY(XBegin,0,0);
   agendaItem->setCellXWidth(XEnd);
-  agendaItem->resizeMe(mGridSpacingX, mGridSpacingX * agendaItem->cellWidth(),mGridSpacingY);
+  agendaItem->resizeMe(mGridSpacingX, mGridSpacingX * agendaItem->cellWidth(),mGridSpacingY, true );
 
   //addChild(agendaItem,XBegin*mGridSpacingX,0);
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 7a685d8..81681df 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -583,5 +583,6 @@ void KOAgendaItem::computeText()
                     mDisplayedText += " (" + mIncidence->recurrence()->recurrenceText() + ")";
                 } else {
-                    mDisplayedText += ": " +KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtStart().date(), true) + " - " + KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtEnd().date(), true) ;
+                    int dur = 1+ (static_cast<Event*>(mIncidence))->dtStart().date().daysTo( (static_cast<Event*>(mIncidence))->dtEnd().date() );
+                    mDisplayedText += ": " +KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtStart().date(), true) + " - " + KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtEnd().date(), true) + " ("+QString::number( dur )+i18n(" days") +")" ;
                 }
             }  
@@ -659,5 +660,5 @@ int KOAgendaItem::cellHeight()
 // it may be that allday agenda items have a needed width > 32000
 // this code is to fix this problem
-int KOAgendaItem::resizeMe( int grid, int wid, int hei )
+int KOAgendaItem::resizeMe( int grid, int wid, int hei, bool invalidWidth )
 {
     int diff = 0;
@@ -670,8 +671,9 @@ int KOAgendaItem::resizeMe( int grid, int wid, int hei )
         }
     }
-    if ( wid == width() || diff >= wid  )
+    if ( (!invalidWidth && wid == width() ) || diff >= wid  )
         resize( wid, hei );
     else
         resize( wid - diff, hei );
+    //qDebug("wid %d x %d ", width(), x());
     return diff;
 }
diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h
index 97acd4c..37d89a6 100644
--- a/korganizer/koagendaitem.h
+++ b/korganizer/koagendaitem.h
@@ -110,5 +110,5 @@ class KOAgendaItem : public QWidget
     void initColor ();
     bool isAllDay() { return mAllDay; }
-    int resizeMe( int grid, int wid, int hei );
+    int resizeMe( int grid, int wid, int hei, bool invalidHei = false );
   public slots:
     bool updateIcons( QPainter *, bool );
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 1cf03a0..d8a2134 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -1236,5 +1236,4 @@ void KOAgendaView::fillAgenda()
                         mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol);
                     }
-                    
                 } else {
                     if (beginX <= 0 && curCol == 0) {