1 files changed, 5 insertions, 3 deletions

diff --git a/core/pim/datebook/datebookday.cpp b/core/pim/datebook/datebookday.cpp
index 8232a51..0b213e9 100644
--- a/core/pim/datebook/datebookday.cpp
+++ b/core/pim/datebook/datebookday.cpp
@@ -421,195 +421,197 @@ void DateBookDay::relayoutPage( bool fromResize )
                         QValueList<int> intersectedWidgets;
 
                         //find all widgets intersecting with widgetList.at(i)
                         for ( int j = 0; j < wCount; j++) {
                                 if (i != j)
                                         if (geometries[j].intersects(geometries[i]))
                                                 intersectedWidgets.append(j);
                         }
 
                         //for each of these intersecting widgets find out how many widgets are they intersecting with
                         for ( uint j = 0; j < intersectedWidgets.count(); j++)
                         {
                                 QArray<int> inter(wCount);
                                 inter[j]=1;
 
                                 if (intersectedWidgets[j] != -1)
                                         for ( uint k = j; k < intersectedWidgets.count(); k++) {
                                                 if (j != k && intersectedWidgets[k] != -1)
                                                         if (geometries[intersectedWidgets[k]].intersects(geometries[intersectedWidgets[j]])) {
                                                                 inter[j]++;
                                                                 intersectedWidgets[k] = -1;
                                                         }
                                                 if (inter[j] > anzIntersect[i]) anzIntersect[i] = inter[j] + 1;
                                         }
                                 }
                         if (anzIntersect[i] == 1 && intersectedWidgets.count()) anzIntersect[i]++;
                 }
 
 
                 for ( int i = 0; i < wCount; i++) {
                         DateBookDayWidget *w = widgetList.at(i);
                         QRect geom = w->geometry();
                         geom.setX( 0 );
                         wd = (view->columnWidth(0)-1) / anzIntersect[i] - (anzIntersect[i]>1?2:0);
                         geom.setWidth( wd );
                         while ( intersects( w, geom ) ) {
                                 geom.moveBy( wd + 2 + 1, 0 );
                         }
                         w->setGeometry( geom );
                 }
 
                 if (jumpToCurTime && this->date() == QDate::currentDate()) {
                         view->setContentsPos( 0, QTime::currentTime().hour() * view->rowHeight(0) ); //set listview to current hour
                 } else {
                         view->setContentsPos( 0, startTime * view->rowHeight(0) );
                 }
         } else {
                 int hours[24];
                 memset( hours, 0, 24*sizeof( int ) );
                 bool overFlow = FALSE;
                 for ( int i = 0; i < wCount; i++ ) {
                         DateBookDayWidget *w = widgetList.at(i);
                         int start = w->event().start().hour();
                         QTime e = w->event().end();
                         int end = e.hour();
                         if ( e.minute() < 5 )
                                 end--;
                         if ( end < start )
                                 end = start;
                         while( start <= end ) {
                                 hours[start]++;
                                 if ( hours[start] >= 10 )
                                         overFlow = TRUE;
                                 ++start;
                         }
                         if ( overFlow )
                                 break;
                 }
                 for ( int i = 0; i < 24; i++ ) {
                         n = QMAX( n, hours[i] );
                 }
                 wid = ( view->columnWidth(0)-1 ) / n;
 
                 bool used[24*10];
                 memset( used, FALSE, 24*10*sizeof( bool ) );
 
                 for ( int i = 0; i < wCount; i++ ) {
                         DateBookDayWidget *w = widgetList.at(i);
                         int xp = place( w, used, n );
                         if ( xp != -1 ) {
                                 QRect geom = w->geometry();
                                 geom.setX( xp*(wid+2) );
                                 geom.setWidth( wid );
                                 w->setGeometry( geom );
                         }
                 }
 
                 if (jumpToCurTime && this->date() == QDate::currentDate()) {
                         view->setContentsPos( 0, QTime::currentTime().hour() * view->rowHeight(0) ); //set listview to current hour
                 } else {
                         view->setContentsPos( 0, startTime * view->rowHeight(0) );
                 }
         }
 
                 timeMarker->setTime( QTime::currentTime() );//display timeMarker
                 timeMarker->raise();                    //on top of all widgets
-                if (this->date() == QDate::currentDate())       //only show timeMarker on current day
-                timeMarker->show(); else timeMarker->hide();
-
+                if (this->date() == QDate::currentDate()) {     //only show timeMarker on current day
+                timeMarker->show();
+        } else {
+                timeMarker->hide();
+        }
         setUpdatesEnabled( TRUE );
         return;
 }
 
 DateBookDayWidget *DateBookDay::intersects( const DateBookDayWidget *item, const QRect &geom )
 {
         int i = 0;
         DateBookDayWidget *w = widgetList.at(i);
         int wCount = widgetList.count();
         while ( i < wCount && w != item ) {
                 if ( w->geometry().intersects( geom ) ) {
                     return w;
                 }
                 w = widgetList.at(++i);
         }
 
         return 0;
 }
 
 
 QDate DateBookDay::date() const
 {
         return currDate;
 }
 
 void DateBookDay::setStartViewTime( int startHere )
 {
         startTime = startHere;
         dayView()->clearSelection();
         QTableSelection ts;
 
                 if (jumpToCurTime && this->date() == QDate::currentDate()) {//this should probably be in datebook.cpp where it's called?
                 ts.init( QTime::currentTime().hour(), 0);
                 ts.expandTo( QTime::currentTime().hour(), 0);
     } else {
                 ts.init( startTime, 0 );
                 ts.expandTo( startTime, 0 );
         }
 
         dayView()->addSelection( ts );
 }
 
 int DateBookDay::startViewTime() const
 {
         return startTime;
 }
 
 void DateBookDay::slotWeekChanged( bool bStartOnMonday )
 {
         header->setStartOfWeek( bStartOnMonday );
         //redraw();
 }
 
 void DateBookDay::keyPressEvent(QKeyEvent *e)
 {
         switch(e->key()) {
                 case Key_Up:
                         view->moveUp();
                         break;
                 case Key_Down:
                         view->moveDown();
                         break;
                 case Key_Left:
                         setDate(QDate(currDate).addDays(-1));
                         break;
                 case Key_Right:
                         setDate(QDate(currDate).addDays(1));
                         break;
                 default:
                         e->ignore();
         }
 }
 
 //===========================================================================
 
 DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e, DateBookDay *db )
         : QWidget( db->dayView()->viewport() ), ev( e ), dateBook( db )
 {
     // why would someone use "<"?  Oh well, fix it up...
     // I wonder what other things may be messed up...
         QString strDesc = ev.description();
         int where = strDesc.find( "<" );
         while ( where != -1 ) {
                 strDesc.remove( where, 1 );
                 strDesc.insert( where, "&#60;" );
                 where = strDesc.find( "<", where );
         }
 
         QString strCat;
 // ### Fix later...
 //     QString strCat = ev.category();
 //     where = strCat.find( "<" );
 //     while ( where != -1 ) {
         // strCat.remove( where, 1 );
         // strCat.insert( where, "&#60;" );
         // where = strCat.find( "<", where );