author | zautrix <zautrix> | 2005-03-30 13:46:29 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-30 13:46:29 (UTC) |
commit | 8c160d7aeeab1d22382ced11440712f6541a6db7 (patch) (unidiff) | |
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 | |||
@@ -163,9 +163,9 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates() | |||
163 | mUpdateTimer->stop(); | 163 | mUpdateTimer->stop(); |
164 | //return; | 164 | //return; |
165 | if ( width() < 3 || height() < 3 ) | 165 | if ( width() < 3 || height() < 3 ) |
166 | return; | 166 | return; |
167 | static int lastWid = 0; | 167 | static int lastWid = 0; |
168 | static int lastHei = 0; | 168 | static int lastHei = 0; |
169 | if ( lastWid == width() && height() == lastHei ) { | 169 | if ( lastWid == width() && height() == lastHei ) { |
170 | qDebug("KODNC: No layout computing needed. "); | 170 | qDebug("KODNC: No layout computing needed. "); |
171 | } else { | 171 | } else { |
@@ -204,10 +204,16 @@ 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 | } | 208 | } else { |
209 | 209 | if ( mNavigatorView->fontChanged() ) { | |
210 | fontchange = true; | ||
211 | fo = KOPrefs::instance()->mDateNavigatorFont; | ||
212 | mNavigatorView->changeFont( fo ); | ||
213 | mNavigatorView->unsetFontChanged(); | ||
214 | } | ||
215 | } | ||
210 | mLastDisplayedDN = horizontalCount*verticalCount-1; | 216 | mLastDisplayedDN = horizontalCount*verticalCount-1; |
211 | while ( count > ( mExtraViews.count() + 1 ) ) { | 217 | while ( count > ( mExtraViews.count() + 1 ) ) { |
212 | KDateNavigator *n = new KDateNavigator( this ); | 218 | KDateNavigator *n = new KDateNavigator( this ); |
213 | n->setMonthSignalOffset ( mExtraViews.count()+1 ); | 219 | n->setMonthSignalOffset ( mExtraViews.count()+1 ); |
@@ -217,23 +223,27 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates() | |||
217 | // n->show(); | 223 | // n->show(); |
218 | } | 224 | } |
219 | 225 | ||
220 | setBaseDates(); | 226 | setBaseDates(); |
227 | if ( fontchange ) { | ||
228 | //mNavigatorView->changeFont( fo ); | ||
229 | uint i; | ||
230 | for( i = 0; i < mExtraViews.count(); ++i ) { | ||
231 | KDateNavigator *view = mExtraViews.at( i ); | ||
232 | view->changeFont( fo ); | ||
233 | } | ||
234 | } | ||
221 | mHorizontalCount = horizontalCount; | 235 | mHorizontalCount = horizontalCount; |
222 | mVerticalCount = verticalCount; | 236 | mVerticalCount = verticalCount; |
223 | 237 | ||
224 | } | 238 | } |
225 | if ( !fontchange ) { | 239 | if ( mNavigatorView->fontChanged() && ! fontchange ) { |
226 | if ( mNavigatorView->fontChanged() ) { | 240 | qDebug("KDNC: Resetting all fonts "); |
227 | fontchange = true; | 241 | fo = KOPrefs::instance()->mDateNavigatorFont; |
228 | fo = KOPrefs::instance()->mDateNavigatorFont; | 242 | mNavigatorView->changeFont( fo ); |
229 | mNavigatorView->changeFont( fo ); | 243 | mNavigatorView->unsetFontChanged(); |
230 | mNavigatorView->unsetFontChanged(); | ||
231 | } | ||
232 | } | ||
233 | if ( fontchange ) { | ||
234 | uint i; | 244 | uint i; |
235 | for( i = 0; i < mLastDisplayedDN; ++i ) { | 245 | for( i = 0; i < mExtraViews.count(); ++i ) { |
236 | KDateNavigator *view = mExtraViews.at( i ); | 246 | KDateNavigator *view = mExtraViews.at( i ); |
237 | view->changeFont( fo ); | 247 | view->changeFont( fo ); |
238 | } | 248 | } |
239 | } | 249 | } |