6 files changed, 28 insertions, 8 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index db33017..cca73f2 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2162,3 +2162,2 @@ void CalendarView::updateTodoViews()
 {
-   
     mTodoList->updateView();
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 4cefb26..770a42b 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -975,2 +975,3 @@ void KOMonthView::resizeEvent(QResizeEvent * e)
     computeLayout();
+    mCells[0]->setFocus();
 }
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 8d8fc2a..82437d8 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -336,2 +336,3 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
 {
+    mPendingUpdateBeforeRepaint = false;
     isFlatDisplay = false;
@@ -535,3 +536,11 @@ void KOTodoView::jumpToDate ()
 }
-
+void  KOTodoView::paintEvent(QPaintEvent * pevent)
+{
+    if ( mPendingUpdateBeforeRepaint ) {
+        updateView();
+       mPendingUpdateBeforeRepaint = false;
+    }
+    KOrg::BaseView::paintEvent( pevent);
+}
+    bool mPendingUpdateBeforeRepaint;
 void KOTodoView::updateView()
@@ -540,5 +549,9 @@ void KOTodoView::updateView()
     if ( mBlockUpdate ) {
-        //qDebug("blocked ");
         return;
     }
+    if ( !isVisible() ) {
+       mPendingUpdateBeforeRepaint = true;
+       return;
+    }
+    //qDebug("KOTodoView::updateView() %x", this);
     if ( isFlatDisplay ) {
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index 68e29bb..16bc133 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -215,2 +215,4 @@ class KOTodoView : public KOrg::BaseView
      */
+    void paintEvent(QPaintEvent * pevent);
+    bool mPendingUpdateBeforeRepaint;
     friend class KOTodoViewItem;
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 35774d6..2cd8792 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -206,4 +206,4 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
     mMainView->processIncidenceSelection( 0 );
-    mMainView->updateView();
-    raiseCurrentView( full );
+    //mMainView->updateView();
+    raiseCurrentView( full, true );
     mMainView->adaptNavigationUnits();
@@ -211,3 +211,3 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
 
-void KOViewManager::raiseCurrentView( bool fullScreen )
+void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView  )
 {
@@ -233,2 +233,5 @@ void KOViewManager::raiseCurrentView( bool fullScreen )
     emit signalFullScreen( !fullScreen );
+    if ( callUpdateView )
+        mMainView->updateView();
+        
     if ( globalFlagBlockAgenda ==  5 ) {
@@ -274,3 +277,3 @@ void KOViewManager::updateView(const QDate &start, const QDate &end)
 
-    if (mTodoView) mTodoView->updateView();
+    if (mTodoView && mTodoView == mCurrentView ) mTodoView->updateView();
 }
@@ -522,3 +525,5 @@ void KOViewManager::showMonthView()
     // if(mMonthView == mCurrentView) return;
+    mMainView->dateNavigator()->blockSignals( true );
     mMainView->dateNavigator()->selectMonth();
+    mMainView->dateNavigator()->blockSignals( false);
     // DateList tmpList = mMainView->dateNavigator()->selectedDates( );
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h
index 137eb2d..66ab138 100644
--- a/korganizer/koviewmanager.h
+++ b/korganizer/koviewmanager.h
@@ -70,3 +70,3 @@ class KOViewManager : public QObject
 
-    void raiseCurrentView( bool fullScreen = false );
+    void raiseCurrentView( bool fullScreen = false , bool updateView = false);