summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/datenavigatorcontainer.cpp36
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
@@ -166,3 +166,3 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates()
return;
- static int lastWid = 0;
+ static int lastWid = 0;
static int lastHei = 0;
@@ -207,4 +207,10 @@ 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;
@@ -220,2 +226,10 @@ 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;
@@ -224,13 +238,9 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates()
}
- 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 );