| -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 @@ -207,9 +207,2 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates() count = horizontalCount * verticalCount; - } else { - if ( mNavigatorView->fontChanged() ) { - fontchange = true; - fo = KOPrefs::instance()->mDateNavigatorFont; - mNavigatorView->changeFont( fo ); - mNavigatorView->unsetFontChanged(); - } } @@ -226,8 +219,18 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates() - 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 ); @@ -236,7 +239,2 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates() } - mHorizontalCount = horizontalCount; - mVerticalCount = verticalCount; - - } - int theight = height() / mVerticalCount; diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 2fca49e..1d09f40 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp @@ -63,3 +63,2 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name ) m_bShowWeekNums = true; - setFont( KOPrefs::instance()->mDateNavigatorFont ); |