Diffstat (limited to 'korganizer/koviewmanager.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/koviewmanager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 94d74f1..c6e76c4 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -199,46 +199,47 @@ void KOViewManager::writeSettings(KConfig *config) | |||
199 | } | 199 | } |
200 | 200 | ||
201 | void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) | 201 | void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) |
202 | { | 202 | { |
203 | 203 | ||
204 | //mFlagShowNextxDays = false; | 204 | //mFlagShowNextxDays = false; |
205 | //if(view == mCurrentView) return; | 205 | //if(view == mCurrentView) return; |
206 | if ( view == 0 ) { | 206 | if ( view == 0 ) { |
207 | view = mCurrentView; | 207 | view = mCurrentView; |
208 | if ( view == 0 ) | 208 | if ( view == 0 ) |
209 | return; | 209 | return; |
210 | } | 210 | } |
211 | bool callupdate = !(view == mCurrentView); | ||
211 | bool full = fullScreen; | 212 | bool full = fullScreen; |
212 | if(view == mCurrentView && view != mWhatsNextView ) { | 213 | if(view == mCurrentView && view != mWhatsNextView ) { |
213 | if ( mCurrentAgendaView < 0 ) | 214 | if ( mCurrentAgendaView < 0 ) |
214 | return; | 215 | return; |
215 | if ( view != mMonthView ) | 216 | if ( view != mMonthView ) |
216 | full = mMainView->leftFrame()->isVisible(); | 217 | full = mMainView->leftFrame()->isVisible(); |
217 | } else { | 218 | } else { |
218 | if ( view == mMonthView && mMonthView) | 219 | if ( view == mMonthView && mMonthView) |
219 | ;//mMonthView->skipResize = true ; | 220 | ;//mMonthView->skipResize = true ; |
220 | mCurrentView = view; | 221 | mCurrentView = view; |
221 | // bool full = fullScreen; | 222 | // bool full = fullScreen; |
222 | bool isFull = !mMainView->leftFrame()->isVisible(); | 223 | bool isFull = !mMainView->leftFrame()->isVisible(); |
223 | if ( isFull && KOPrefs::instance()->mViewChangeHoldFullscreen ) | 224 | if ( isFull && KOPrefs::instance()->mViewChangeHoldFullscreen ) |
224 | full = true; | 225 | full = true; |
225 | if ( !isFull && KOPrefs::instance()->mViewChangeHoldNonFullscreen ) | 226 | if ( !isFull && KOPrefs::instance()->mViewChangeHoldNonFullscreen ) |
226 | full = false; | 227 | full = false; |
227 | } | 228 | } |
228 | if ( mAgendaView ) mAgendaView->deleteSelectedDateTime(); | 229 | if ( mAgendaView ) mAgendaView->deleteSelectedDateTime(); |
229 | //raiseCurrentView( full ); | 230 | //raiseCurrentView( full ); |
230 | mMainView->processIncidenceSelection( 0 ); | 231 | mMainView->processIncidenceSelection( 0 ); |
231 | //mMainView->updateView(); | 232 | //mMainView->updateView(); |
232 | raiseCurrentView( full, true ); | 233 | raiseCurrentView( full, callupdate ); |
233 | mMainView->adaptNavigationUnits(); | 234 | mMainView->adaptNavigationUnits(); |
234 | } | 235 | } |
235 | 236 | ||
236 | void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView ) | 237 | void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView ) |
237 | { | 238 | { |
238 | mCurrentAgendaView = 0; | 239 | mCurrentAgendaView = 0; |
239 | if ( fullScreen ) { | 240 | if ( fullScreen ) { |
240 | mMainView->leftFrame()->hide(); | 241 | mMainView->leftFrame()->hide(); |
241 | } else { | 242 | } else { |
242 | mMainView->leftFrame()->show(); | 243 | mMainView->leftFrame()->show(); |
243 | } | 244 | } |
244 | //if ( mCurrentView == mMonthView ) qApp->processEvents(); | 245 | //if ( mCurrentView == mMonthView ) qApp->processEvents(); |