From 825d220be0243c6f645274ac799a97e74269890d Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sat, 3 Dec 2022 14:29:17 +0100 Subject: [PATCH] Animations in GridComponent are now finished on menu opening, game launch etc. --- es-core/src/components/primary/GridComponent.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/es-core/src/components/primary/GridComponent.h b/es-core/src/components/primary/GridComponent.h index 70b738e8a..4adf92ec7 100644 --- a/es-core/src/components/primary/GridComponent.h +++ b/es-core/src/components/primary/GridComponent.h @@ -79,7 +79,13 @@ private: } void onCursorChanged(const CursorState& state) override; bool isScrolling() const override { return List::isScrolling(); } - void stopScrolling() override { List::stopScrolling(); } + void stopScrolling() override + { + List::stopScrolling(); + // Only finish the animation if we're in the gamelist view. + if (mGamelistView) + GuiComponent::finishAnimation(0); + } const int getScrollingVelocity() override { return List::getScrollingVelocity(); } void clear() override { List::clear(); } const T& getSelected() const override { return List::getSelected(); }