| -rw-r--r-- | korganizer/kotodoview.cpp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 8d354c8..e2966f8 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -750,3 +750,2 @@ void KOTodoView::updateView() } - storeCurrentItem(); //qDebug("KOTodoView::updateView() %x", this); @@ -754,5 +753,5 @@ void KOTodoView::updateView() displayAllFlat(); - resetCurrentItem(); return; } + storeCurrentItem(); //qDebug("update "); @@ -837,3 +836,2 @@ void KOTodoView::updateView() resetCurrentItem(); - processSelectionChange(); } @@ -862,3 +860,3 @@ void KOTodoView::resetCurrentItem() { - mTodoListView->setFocus(); + //mTodoListView->setFocus(); KOTodoViewItem* foundItem = 0; @@ -898,2 +896,3 @@ void KOTodoView::resetCurrentItem() if ( foundItem ) { + mTodoListView->setSelected ( foundItem, true ); mTodoListView->setCurrentItem( foundItem ); @@ -901,2 +900,4 @@ void KOTodoView::resetCurrentItem() } else { + if ( mTodoListView->firstChild () ) { + mTodoListView->setSelected ( mTodoListView->firstChild (), true ); mTodoListView->setCurrentItem( mTodoListView->firstChild () ); @@ -904,2 +905,9 @@ void KOTodoView::resetCurrentItem() } + } + processSelectionChange(); + QTimer::singleShot( 100, this, SLOT ( resetFocusToList() )); +} +void KOTodoView::resetFocusToList() +{ + topLevelWidget()->setActiveWindow(); mTodoListView->setFocus(); @@ -1406,2 +1414,3 @@ void KOTodoView::displayAllFlat() { + storeCurrentItem(); pendingSubtodo = 0; @@ -1420,4 +1429,3 @@ void KOTodoView::displayAllFlat() } - mTodoListView->setFocus(); - processSelectionChange(); + resetCurrentItem(); } @@ -1432,5 +1440,3 @@ void KOTodoView::setAllFlat() } - storeCurrentItem(); displayAllFlat(); - resetCurrentItem(); } |