Revert " Fix for N_SE-49644 (Item disappearing when new item added)"

This reverts commit 7c452ee15d7008addb56d78b8b7645af6b72b06d.

Change-Id: Ided6bc7c50c6726f40add4bf33e0a787288bb06d

diff --git a/src/ui/controls/FUiCtrl_TableViewPresenter.cpp b/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
index db04ae1..d90f7b7 100644 (file)
--- a/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
@@ -872,7 +872,7 @@ _TableViewPresenter::IsCachingItemsTotalHeightLessThanViewHeight(void)
                }
        } while (GetNextItemPosition(firstLoadedItemPos, firstLoadedItemPos));
 
-       if (loadedItemCount < currentCachingsize || (viewHeight + GetScrollPosition()) < (itemTotalHeight - lastItemHeight))
+       if (loadedItemCount < currentCachingsize || viewHeight < (itemTotalHeight - lastItemHeight))
        {
                return false;
        }
@@ -921,7 +921,7 @@ _TableViewPresenter::RefreshItemLayout(TableViewItemTag& topDrawnItemTag, TableV
        TableViewItemTag currentItem = {-1, -1};
 
        int loadItemCount = 0;
-
+       int maxLoadItemCount = GetMaxItemCachingSize();
        FloatRectangle itemBounds(0.0f, 0.0f, 0.0f, 0.0f);
 
        StopAllItemAnimation();
@@ -991,14 +991,14 @@ _TableViewPresenter::RefreshItemLayout(TableViewItemTag& topDrawnItemTag, TableV
 
                loadItemCount++;
 
-       } while (loadItemCount < GetMaxItemCachingSize() && GetNextItemPosition(currentItem, itemPos));
+       } while (loadItemCount < maxLoadItemCount && GetNextItemPosition(currentItem, itemPos));
 
-       if (loadItemCount < GetMaxItemCachingSize())
+       if (loadItemCount < maxLoadItemCount)
        {
                __pListModel->GetFirstLoadedItemIndex(itemPos.groupIndex, itemPos.itemIndex);
                currentItem = itemPos;
 
-               while (loadItemCount < GetMaxItemCachingSize() && GetPreviousItemPosition(currentItem, itemPos))
+               while (loadItemCount < maxLoadItemCount && GetPreviousItemPosition(currentItem, itemPos))
                {
                        pItem = LoadItem(itemPos.groupIndex, itemPos.itemIndex);