text

1 files changed, 5 insertions, 6 deletions

diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 9888566..6294b98 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -677,37 +677,33 @@ QDate MonthViewCell::selectedIncidenceDate()
 
 void MonthViewCell::deselect()
 {
     mItemList->clearSelection();
     enableScrollBars( false );
     // updateCell();
 }
 void MonthViewCell::select()
 {
     ;// updateCell();
 }
 
 void MonthViewCell::resizeEvent ( QResizeEvent * )
 {
     if ( !mMonthView->isUpdatePossible() )
         return;
-#ifndef DESKTOP_VERSION
-    if ( !isVisible() ){
-        return;
-    }
-#endif
+
     int size = height() - mLabel->height() - 2;
     if ( size > 0 )
         mItemList->verticalScrollBar()->setMaximumHeight( size );
     size = width() - mLabel->width() -2;
     if ( size > 0 )
         mItemList->horizontalScrollBar()->setMaximumWidth( size );
     mLabel->move( width()-mItemList->lineWidth() - mLabel->width(), height()-mItemList->lineWidth() - mLabel->height() );
     //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2);
 }
 
 void MonthViewCell::defaultAction( QListBoxItem *item )
 {
     if ( !item ) return;
 
     MonthViewItem *eventItem = static_cast<MonthViewItem *>( item );
     Incidence *incidence = eventItem->incidence();
@@ -828,32 +824,34 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
     }
 
     connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ),
                      SLOT( switchView() ) );
     mContextMenu = eventPopup();
     // updateConfig(); //useless here
 
     emit incidenceSelected( 0 );
 }
 
 KOMonthView::~KOMonthView()
 {
     delete mContextMenu;
 }
 void KOMonthView::switchView()
 {
+    if ( selectedCell( ) )
+        selectedCell()->deselect();
     mShowWeekView = !mShowWeekView;
     KOPrefs::instance()->mMonthViewWeek = mShowWeekView;
     emit showNavigator( !mShowWeekView );
     computeLayout();
     updateConfig();
 }
 
 int KOMonthView::maxDatesHint()
 {
     return mNumCells;
 }
 
 int KOMonthView::currentDateCount()
 {
     return mNumCells;
 }
@@ -1146,37 +1144,38 @@ void KOMonthView::computeLayoutWeek()
     int lastCol = wid - ( colWid*6  ); 
     int dayLabelHei = mDayLabels[0]->sizeHint().height();
     int cellHei = (hei - (5- daysToShow )*dayLabelHei) /(5- daysToShow ); 
     int colModulo = wid % daysToShow;
     int rowModulo = (hei- (5- daysToShow )*dayLabelHei) % daysToShow-1;
     //qDebug("rowmod %d ", rowModulo);
     int i;
     int x,y,w,h;
     x= 0;
     y= 0;
     w = colWid;
     h = dayLabelHei ;
     for ( i = 0; i < 7; i++) {
         if ( i && !( i % daysToShow) && i < 6) {
             y += hei/(5-daysToShow);
             x = 0;
+            w =  colWid;
         }
         if ( i == daysToShow-colModulo )
             ++w;
         if ( i >=  5 ) {
-            mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2,h);
+            mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2+1,h);
             x -= w/2 ;
         }
         else
             mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h);
         x += w;                                   
     }
     x= 0;
     y= dayLabelHei;
     w = colWid;
     h = cellHei;
     for ( i = 0; i < mCells.count(); ++i) {
         if ( i > 6 ) {
             mCells[i]->hide();
             continue;
         }