From 5247a9f5fe6ce0ad95986a09ae65597bdcb190c7 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Sun, 24 Oct 2021 12:10:38 +0200
Subject: [PATCH] Fixed an issue where the wrong scroll indicator could be
 shown.

---
 es-core/src/components/ComponentList.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/es-core/src/components/ComponentList.cpp b/es-core/src/components/ComponentList.cpp
index 1457e3d14..cee1ab3bb 100644
--- a/es-core/src/components/ComponentList.cpp
+++ b/es-core/src/components/ComponentList.cpp
@@ -249,8 +249,16 @@ void ComponentList::updateCameraOffset()
         while (mCameraOffset < target && i < mEntries.size()) {
             mCameraOffset += getRowHeight(mEntries.at(i).data);
             if (mCameraOffset > totalHeight - mSize.y) {
-                if (mSetupCompleted && mCameraOffset != oldCameraOffset)
-                    mBottomCameraOffset = true;
+                if (mSetupCompleted) {
+                    if (mScrollIndicatorStatus == ComponentList::SCROLL_NONE &&
+                        oldCameraOffset == 0.0f)
+                        break;
+                    if (mScrollIndicatorStatus != ComponentList::SCROLL_NONE &&
+                        oldCameraOffset == 0.0f)
+                        mBottomCameraOffset = true;
+                    else if (mCameraOffset != oldCameraOffset)
+                        mBottomCameraOffset = true;
+                }
                 break;
             }
             i++;