From ba04f6a4b6b651dcff11ca17103cba42330e52be Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Fri, 08 Apr 2005 11:36:36 +0000
Subject: fix

---
(limited to 'korganizer/kotodoview.cpp')

diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 395325c..935a5f5 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -731,6 +731,7 @@ void KOTodoView::storeCurrentItem()
 {
     mCurItem = 0;
     mCurItemRootParent = 0;
+    mCurItemParent = 0;
     mCurItemAbove = 0; 
     mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
     if (mActiveItem) {
@@ -739,6 +740,7 @@ void KOTodoView::storeCurrentItem()
         if ( activeItemAbove )
             mCurItemAbove = activeItemAbove->todo();
         mCurItemRootParent = mCurItem;
+        mCurItemParent = mCurItemRootParent->relatedTo();
         while ( mCurItemRootParent->relatedTo() != 0 )
             mCurItemRootParent = mCurItemRootParent->relatedTo();
     }
@@ -750,6 +752,7 @@ void KOTodoView::resetCurrentItem()
     mTodoListView->setFocus();
     KOTodoViewItem* foundItem = 0; 
     KOTodoViewItem* foundItemRoot = 0; 
+    KOTodoViewItem* foundItemParent = 0; 
     KOTodoViewItem* foundItemAbove = 0; 
     if ( mTodoListView->firstChild ()  ) {
         if ( mCurItem ) {
@@ -761,16 +764,24 @@ void KOTodoView::resetCurrentItem()
                 } else if ( item->todo() ==  mCurItemAbove ) {
                     foundItemAbove = item;
 
-                } else if ( item->todo() ==  mCurItemRootParent ) {
+                } 
+                if ( item->todo() ==  mCurItemRootParent ) {
                     foundItemRoot = item;
                 }
+                if ( item->todo() ==  mCurItemParent ) {
+                    foundItemParent = item;
+                }
                 item = (KOTodoViewItem*)item->itemBelow();
             }
             if ( ! foundItem ) {
-                if ( foundItemRoot )
-                    foundItem = foundItemRoot;
-                else
-                    foundItem = foundItemAbove;
+                if ( foundItemParent ) {
+                    foundItem = foundItemParent;
+                } else {
+                    if ( foundItemRoot )
+                        foundItem = foundItemRoot;
+                    else
+                        foundItem = foundItemAbove;
+                }
             }  
         } 
         if ( foundItem ) {
--
cgit v0.9.0.2