optimize calls to updateInfoPanel

RetroPie · May 20, 2021 · 1a0775b · 1a0775b
1 parent c6bbd38
commit 1a0775b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/es-app/src/views/gamelist/DetailedGameListView.cpp b/es-app/src/views/gamelist/DetailedGameListView.cpp
@@ -212,15 +212,19 @@ void DetailedGameListView::initMDValues()
 
 void DetailedGameListView::updateInfoPanel()
 {
-	FileData* file = (mList.size() == 0 || mList.isScrolling()) ? NULL : mList.getSelected();
+	FileData* file = (mList.size() == 0 || (mList.getScrollingVelocity() != 0)) ? NULL : mList.getSelected();
 
 	bool fadingOut;
 	if(file == NULL)
 	{
+		LOG(LogDebug) << "DetailedGameListView::updateInfoPanel() : Clearing!";
+
 		//mImage.setImage("");
 		//mDescription.setText("");
 		fadingOut = true;
 	}else{
+		LOG(LogDebug) << "DetailedGameListView::updateInfoPanel() : Drawing!";
+
 		mThumbnail.setImage(file->getThumbnailPath());
 		mMarquee.setImage(file->getMarqueePath());
 		mImage.setImage(file->getImagePath());

diff --git a/es-app/src/views/gamelist/GridGameListView.cpp b/es-app/src/views/gamelist/GridGameListView.cpp
@@ -310,13 +310,17 @@ void GridGameListView::updateInfoPanel()
 	bool fadingOut;
 	if(file == NULL)
 	{
+		LOG(LogDebug) << "GridGameListView::updateInfoPanel() : Clearing!";
+
 		mVideo->setVideo("");
 		mVideo->setImage("");
 		mVideoPlaying = false;
 
 		//mDescription.setText("");
 		fadingOut = true;
 	}else{
+		LOG(LogDebug) << "GridGameListView::updateInfoPanel() : Drawing!";
+
 		if (!mVideo->setVideo(file->getVideoPath()))
 		{
 			mVideo->setDefaultVideo();

diff --git a/es-app/src/views/gamelist/VideoGameListView.cpp b/es-app/src/views/gamelist/VideoGameListView.cpp
@@ -246,11 +246,13 @@ void VideoGameListView::initMDValues()
 
 void VideoGameListView::updateInfoPanel()
 {
-	FileData* file = (mList.size() == 0 || mList.isScrolling()) ? NULL : mList.getSelected();
+	FileData* file = (mList.size() == 0 || (mList.getScrollingVelocity() != 0)) ? NULL : mList.getSelected();
 
 	bool fadingOut;
 	if(file == NULL)
 	{
+		LOG(LogDebug) << "VideoGameListView::updateInfoPanel() : Clearing!";
+
 		mVideo->setVideo("");
 		mVideo->setImage("");
 		mVideoPlaying = false;
@@ -259,6 +261,8 @@ void VideoGameListView::updateInfoPanel()
 		fadingOut = true;
 
 	}else{
+		LOG(LogDebug) << "VideoGameListView::updateInfoPanel() : Drawing!";
+
 		if (!mVideo->setVideo(file->getVideoPath()))
 		{
 			mVideo->setDefaultVideo();

diff --git a/es-core/src/components/IList.h b/es-core/src/components/IList.h
@@ -58,12 +58,12 @@ class IList : public GuiComponent
 	};
 
 protected:
-	int mCursor;
+	int mCursor; //This is the current position in the list
 
-	int mScrollTier;
-	int mScrollVelocity;
+	int mScrollTier; //This lists the the scrolling "speed gear"
+	int mScrollVelocity; //This is the the steps/interval and direction (-/+)
 
-	int mScrollTierAccumulator;
+	int mScrollTierAccumulator; //This counts until it needs to switch to higher gear
 	int mScrollCursorAccumulator;
 
 	unsigned char mTitleOverlayOpacity;
@@ -191,10 +191,6 @@ class IList : public GuiComponent
 	{
 		PowerSaver::setState(velocity == 0);
 
-		// generate an onCursorChanged event in the stopped state when the user lets go of the key
-		if(velocity == 0 && mScrollVelocity != 0)
-			onCursorChanged(CURSOR_STOPPED);
-
 		mScrollVelocity = velocity;
 		mScrollTier = 0;
 		mScrollTierAccumulator = 0;
@@ -302,7 +298,7 @@ class IList : public GuiComponent
 			onScroll(absAmt);
 
 		mCursor = cursor;
-		onCursorChanged((mScrollTier > 0) ? CURSOR_SCROLLING : CURSOR_STOPPED);
+		onCursorChanged((amt != 0) ? CURSOR_SCROLLING : CURSOR_STOPPED);
 	}
 
 	virtual void onCursorChanged(const CursorState& /*state*/) {}