Merge pull request Aloshi#786 from Gemba/fix_quicksys_select_scrolling

fixes continued scrolling on system leave and reenter navigation
joolswills · Apr 24, 2022 · b93b19b · b93b19b
2 parents 3079ef8 + 69ee73c
commit b93b19b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 1 deletion.
diff --git a/es-app/src/views/gamelist/BasicGameListView.cpp b/es-app/src/views/gamelist/BasicGameListView.cpp
@@ -161,3 +161,7 @@ std::vector<HelpPrompt> BasicGameListView::getHelpPrompts()
 	}
 	return prompts;
 }
+
+void BasicGameListView::onFocusLost() {
+	mList.stopScrolling(true);
+}
diff --git a/es-app/src/views/gamelist/BasicGameListView.h b/es-app/src/views/gamelist/BasicGameListView.h
@@ -23,6 +23,8 @@ class BasicGameListView : public ISimpleGameListView
 	virtual std::vector<HelpPrompt> getHelpPrompts() override;
 	virtual void launch(FileData* game) override;
 
+        void onFocusLost() override;
+
 protected:
 	virtual std::string getQuickSystemSelectRightButton() override;
 	virtual std::string getQuickSystemSelectLeftButton() override;

diff --git a/es-app/src/views/gamelist/DetailedGameListView.cpp b/es-app/src/views/gamelist/DetailedGameListView.cpp
@@ -311,4 +311,5 @@ std::vector<GuiComponent*> DetailedGameListView::getMDValues()
 
 void DetailedGameListView::onFocusLost() {
 	mDescContainer.reset();
+	mList.stopScrolling(true);
 }
diff --git a/es-app/src/views/gamelist/VideoGameListView.cpp b/es-app/src/views/gamelist/VideoGameListView.cpp
@@ -401,4 +401,5 @@ void VideoGameListView::onShow()
 
 void VideoGameListView::onFocusLost() {
 	mDescContainer.reset();
+	mList.stopScrolling(true);
 }
diff --git a/es-core/src/components/IList.h b/es-core/src/components/IList.h
@@ -103,10 +103,16 @@ class IList : public GuiComponent
 		return mScrollVelocity;
 	}
 
-	void stopScrolling()
+	void stopScrolling(bool focusLost = false)
 	{
+		if (focusLost) {
+			// force remove overlay (large two letter display in center) when user scrolls
+			// at max speed through list and then abruptly leaves the system
+			mTitleOverlayOpacity = 0;
+		}
 		listInput(0);
 		onCursorChanged(CURSOR_STOPPED);
+
 	}
 
 	void clear()