summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/datenavigatorcontainer.cpp36
-rw-r--r--korganizer/kdatenavigator.cpp1
2 files changed, 17 insertions, 20 deletions
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index 27ba9e0..f6f62a4 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -207,11 +207,4 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates()
count = horizontalCount * verticalCount;
- } else {
- if ( mNavigatorView->fontChanged() ) {
- fontchange = true;
- fo = KOPrefs::instance()->mDateNavigatorFont;
- mNavigatorView->changeFont( fo );
- mNavigatorView->unsetFontChanged();
- }
- }
-
+ }
+
mLastDisplayedDN = horizontalCount*verticalCount-1;
@@ -226,12 +219,3 @@ 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;
@@ -240,3 +224,17 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates()
}
-
+ if ( !fontchange ) {
+ if ( mNavigatorView->fontChanged() ) {
+ fontchange = true;
+ fo = KOPrefs::instance()->mDateNavigatorFont;
+ mNavigatorView->changeFont( fo );
+ mNavigatorView->unsetFontChanged();
+ }
+ }
+ if ( fontchange ) {
+ uint i;
+ for( i = 0; i < mLastDisplayedDN; ++i ) {
+ KDateNavigator *view = mExtraViews.at( i );
+ view->changeFont( fo );
+ }
+ }
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 );