-rw-r--r-- | korganizer/datenavigatorcontainer.cpp | 28 | ||||
-rw-r--r-- | korganizer/kdatenavigator.cpp | 1 |
2 files changed, 13 insertions, 16 deletions
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index 27ba9e0..f6f62a4 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp @@ -205,13 +205,6 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates() 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; @@ -224,21 +217,26 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates() // n->show(); } - setBaseDates(); + mHorizontalCount = horizontalCount; + mVerticalCount = verticalCount; + + } + if ( !fontchange ) { + if ( mNavigatorView->fontChanged() ) { + fontchange = true; + fo = KOPrefs::instance()->mDateNavigatorFont; + mNavigatorView->changeFont( fo ); + mNavigatorView->unsetFontChanged(); + } + } if ( fontchange ) { - //mNavigatorView->changeFont( fo ); uint i; - for( i = 0; i < mExtraViews.count(); ++i ) { + for( i = 0; i < mLastDisplayedDN; ++i ) { KDateNavigator *view = mExtraViews.at( i ); view->changeFont( fo ); } } - mHorizontalCount = horizontalCount; - mVerticalCount = verticalCount; - - } - int theight = height() / mVerticalCount; int twidth = width() / mHorizontalCount; diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 2fca49e..1d09f40 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp @@ -61,7 +61,6 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name ) mSelectedDates.append(startDate); m_MthYr = startDate; m_bShowWeekNums = true; - setFont( KOPrefs::instance()->mDateNavigatorFont ); mNavigatorBar = new NavigatorBar( startDate, this ); topLayout->addMultiCellWidget( mNavigatorBar, 0, 0, 0, 7 ); |