1 files changed, 18 insertions, 8 deletions

diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index f6f62a4..92abae6 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -184,76 +184,86 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates()
         QFont fo;
         if ( horizontalCount != mHorizontalCount ||
              verticalCount != mVerticalCount ) {
             uint count = horizontalCount * verticalCount;
             if ( count == 0 ) {
                 bool ok;
                 fo = mNavigatorView->yourFontHint( size() , &ok );
                 //mNavigatorView->resize( size() );
                 //if ( ! ok )
                 //  return;
                 int butt = 2;
                 horizontalCount =  size().width() / mNavigatorView->sizeHintTwoButtons( ).width();
                 if (  horizontalCount <= 1 )
                     minSize = mNavigatorView->sizeHintTwoButtons( 4 ); 
                 else 
                     minSize = mNavigatorView->sizeHintTwoButtons(); 
                 verticalCount = size().height() / minSize.height();
                 horizontalCount = size().width() / minSize.width();
                 if ( horizontalCount == 0 )
                     horizontalCount = 1;
                 if ( verticalCount == 0 )
                     verticalCount = 1;
                 fontchange = true;
                 count = horizontalCount * verticalCount;
+            } else {
+                if ( mNavigatorView->fontChanged() ) {
+                    fontchange = true;
+                    fo = KOPrefs::instance()->mDateNavigatorFont;
+                    mNavigatorView->changeFont( fo );
+                    mNavigatorView->unsetFontChanged();
+                }
             } 
-            
             mLastDisplayedDN =  horizontalCount*verticalCount-1;
             while ( count > ( mExtraViews.count() + 1 ) ) {
                 KDateNavigator *n = new KDateNavigator( this );
                 n->setMonthSignalOffset ( mExtraViews.count()+1 );
                 mExtraViews.append( n );
                 n->setCalendar( mCalendar );
                 connectNavigatorView( n );
                 // n->show();
             }
             
             setBaseDates();
+            if ( fontchange ) {
+                //mNavigatorView->changeFont( fo );
+                uint i;
+                for( i = 0; i < mExtraViews.count(); ++i ) {
+                    KDateNavigator *view = mExtraViews.at( i );
+                    view->changeFont( fo );
+                }
+            }
             mHorizontalCount = horizontalCount;
             mVerticalCount = verticalCount;
     
         }
-        if ( !fontchange ) {
-            if ( mNavigatorView->fontChanged() ) {
-                fontchange = true;
+        if ( mNavigatorView->fontChanged() && ! fontchange  ) {
+            qDebug("KDNC: Resetting all fonts ");
                 fo = KOPrefs::instance()->mDateNavigatorFont;
                 mNavigatorView->changeFont( fo );
                 mNavigatorView->unsetFontChanged();
-            }
-        }
-        if ( fontchange ) {
             uint i;
-            for( i = 0; i < mLastDisplayedDN; ++i ) {
+            for( i = 0; i < mExtraViews.count(); ++i ) {
                 KDateNavigator *view = mExtraViews.at( i );
                 view->changeFont( fo );
             }
         }
         int theight = height() / mVerticalCount;
         int twidth = width() / mHorizontalCount;
 
         NavigatorBar *bar = mNavigatorView->navigatorBar();
         if ( mHorizontalCount > 1 ) bar->showButtons( true, false );
         else bar->showButtons( true, true );
 
         mNavigatorView->setGeometry(0,
                                     0, twidth, theight );
         for( uint i = 0; i < mLastDisplayedDN; ++i ) {
             int x = ( i + 1 ) % mHorizontalCount;
             int y = ( i + 1 ) / mHorizontalCount;
 
             KDateNavigator *view = mExtraViews.at( i );
             bar = view->navigatorBar();
             if ( y > 0 ) bar->showButtons( false, false );
             else {
                 if ( x + 1 == mHorizontalCount ) bar->showButtons( false, true );
                 else bar->showButtons( false, false );
             }