| author | zautrix <zautrix> | 2005-03-30 13:46:29 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-03-30 13:46:29 (UTC) |
| commit | 8c160d7aeeab1d22382ced11440712f6541a6db7 (patch) (side-by-side diff) | |
| tree | 83fd0df6d30db6bbb05d82dc400d6f51823f5b3a | |
| parent | 056f171723a9301aea5a65340dffeda34e078abf (diff) | |
| download | kdepimpi-8c160d7aeeab1d22382ced11440712f6541a6db7.zip kdepimpi-8c160d7aeeab1d22382ced11440712f6541a6db7.tar.gz kdepimpi-8c160d7aeeab1d22382ced11440712f6541a6db7.tar.bz2 | |
fixes
| -rw-r--r-- | korganizer/datenavigatorcontainer.cpp | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index f6f62a4..92abae6 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp @@ -165,5 +165,5 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates() if ( width() < 3 || height() < 3 ) return; - static int lastWid = 0; + static int lastWid = 0; static int lastHei = 0; if ( lastWid == width() && height() == lastHei ) { @@ -206,6 +206,12 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates() 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 ) ) { @@ -219,19 +225,23 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates() 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; - fo = KOPrefs::instance()->mDateNavigatorFont; - mNavigatorView->changeFont( fo ); - mNavigatorView->unsetFontChanged(); - } - } - if ( fontchange ) { + if ( mNavigatorView->fontChanged() && ! fontchange ) { + qDebug("KDNC: Resetting all fonts "); + fo = KOPrefs::instance()->mDateNavigatorFont; + mNavigatorView->changeFont( fo ); + mNavigatorView->unsetFontChanged(); uint i; - for( i = 0; i < mLastDisplayedDN; ++i ) { + for( i = 0; i < mExtraViews.count(); ++i ) { KDateNavigator *view = mExtraViews.at( i ); view->changeFont( fo ); |