Diffstat (limited to 'korganizer/datenavigatorcontainer.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/datenavigatorcontainer.cpp | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index 27ba9e0..f6f62a4 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp | |||
@@ -204,17 +204,10 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates() | |||
204 | if ( verticalCount == 0 ) | 204 | if ( verticalCount == 0 ) |
205 | verticalCount = 1; | 205 | verticalCount = 1; |
206 | fontchange = true; | 206 | fontchange = true; |
207 | count = horizontalCount * verticalCount; | 207 | count = horizontalCount * verticalCount; |
208 | } else { | 208 | } |
209 | if ( mNavigatorView->fontChanged() ) { | 209 | |
210 | fontchange = true; | ||
211 | fo = KOPrefs::instance()->mDateNavigatorFont; | ||
212 | mNavigatorView->changeFont( fo ); | ||
213 | mNavigatorView->unsetFontChanged(); | ||
214 | } | ||
215 | } | ||
216 | |||
217 | mLastDisplayedDN = horizontalCount*verticalCount-1; | 210 | mLastDisplayedDN = horizontalCount*verticalCount-1; |
218 | while ( count > ( mExtraViews.count() + 1 ) ) { | 211 | while ( count > ( mExtraViews.count() + 1 ) ) { |
219 | KDateNavigator *n = new KDateNavigator( this ); | 212 | KDateNavigator *n = new KDateNavigator( this ); |
220 | n->setMonthSignalOffset ( mExtraViews.count()+1 ); | 213 | n->setMonthSignalOffset ( mExtraViews.count()+1 ); |
@@ -223,23 +216,28 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates() | |||
223 | connectNavigatorView( n ); | 216 | connectNavigatorView( n ); |
224 | // n->show(); | 217 | // n->show(); |
225 | } | 218 | } |
226 | 219 | ||
227 | |||
228 | setBaseDates(); | 220 | setBaseDates(); |
229 | if ( fontchange ) { | ||
230 | //mNavigatorView->changeFont( fo ); | ||
231 | uint i; | ||
232 | for( i = 0; i < mExtraViews.count(); ++i ) { | ||
233 | KDateNavigator *view = mExtraViews.at( i ); | ||
234 | view->changeFont( fo ); | ||
235 | } | ||
236 | } | ||
237 | mHorizontalCount = horizontalCount; | 221 | mHorizontalCount = horizontalCount; |
238 | mVerticalCount = verticalCount; | 222 | mVerticalCount = verticalCount; |
239 | 223 | ||
240 | } | 224 | } |
241 | 225 | if ( !fontchange ) { | |
226 | if ( mNavigatorView->fontChanged() ) { | ||
227 | fontchange = true; | ||
228 | fo = KOPrefs::instance()->mDateNavigatorFont; | ||
229 | mNavigatorView->changeFont( fo ); | ||
230 | mNavigatorView->unsetFontChanged(); | ||
231 | } | ||
232 | } | ||
233 | if ( fontchange ) { | ||
234 | uint i; | ||
235 | for( i = 0; i < mLastDisplayedDN; ++i ) { | ||
236 | KDateNavigator *view = mExtraViews.at( i ); | ||
237 | view->changeFont( fo ); | ||
238 | } | ||
239 | } | ||
242 | int theight = height() / mVerticalCount; | 240 | int theight = height() / mVerticalCount; |
243 | int twidth = width() / mHorizontalCount; | 241 | int twidth = width() / mHorizontalCount; |
244 | 242 | ||
245 | NavigatorBar *bar = mNavigatorView->navigatorBar(); | 243 | NavigatorBar *bar = mNavigatorView->navigatorBar(); |