Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed multiple issues where the wrong navigation sound would play.

Browse source
This commit is contained in:
Leon Styhre 2022-12-18 12:24:12 +01:00
parent 755cb62017
commit 354da078a3
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
es-core/src/components/primary/CarouselComponent.h
View file

@ -92,7 +92,10 @@ private:
void onCursorChanged(const CursorState& state) override; void onCursorChanged(const CursorState& state) override;
void onScroll() override void onScroll() override
{ {
NavigationSounds::getInstance().playThemeNavigationSound(SYSTEMBROWSESOUND); if (mGamelistView)
NavigationSounds::getInstance().playThemeNavigationSound(SCROLLSOUND);
else
NavigationSounds::getInstance().playThemeNavigationSound(SYSTEMBROWSESOUND);
} }
void stopScrolling() override void stopScrolling() override

4
es-core/src/components/primary/GridComponent.h
View file

@ -76,8 +76,10 @@ public:
private: private:
void onScroll() override void onScroll() override
{ {
if (!NavigationSounds::getInstance().isPlayingThemeNavigationSound(SCROLLSOUND)) if (mGamelistView)
NavigationSounds::getInstance().playThemeNavigationSound(SCROLLSOUND); NavigationSounds::getInstance().playThemeNavigationSound(SCROLLSOUND);
else
NavigationSounds::getInstance().playThemeNavigationSound(SYSTEMBROWSESOUND);
} }
void onCursorChanged(const CursorState& state) override; void onCursorChanged(const CursorState& state) override;
bool isScrolling() const override { return List::isScrolling(); } bool isScrolling() const override { return List::isScrolling(); }

7
es-core/src/components/primary/TextListComponent.h
View file

@ -86,8 +86,11 @@ private:
void onShow() override { mLoopTime = 0; } void onShow() override { mLoopTime = 0; }
void onScroll() override void onScroll() override
{ {
if (!NavigationSounds::getInstance().isPlayingThemeNavigationSound(SCROLLSOUND)) if (mGamelistView &&
!NavigationSounds::getInstance().isPlayingThemeNavigationSound(SCROLLSOUND))
NavigationSounds::getInstance().playThemeNavigationSound(SCROLLSOUND); NavigationSounds::getInstance().playThemeNavigationSound(SCROLLSOUND);
else if (!mGamelistView)
NavigationSounds::getInstance().playThemeNavigationSound(SYSTEMBROWSESOUND);
} }
void onCursorChanged(const CursorState& state) override; void onCursorChanged(const CursorState& state) override;
bool isScrolling() const override { return List::isScrolling(); } bool isScrolling() const override { return List::isScrolling(); }
@ -126,6 +129,7 @@ private:
std::shared_ptr<Font> mFont; std::shared_ptr<Font> mFont;
std::string mIndicators; std::string mIndicators;
std::string mCollectionIndicators; std::string mCollectionIndicators;
bool mGamelistView;
bool mLegacyMode; bool mLegacyMode;
bool mFadeAbovePrimary; bool mFadeAbovePrimary;
LetterCase mLetterCase; LetterCase mLetterCase;
@ -161,6 +165,7 @@ TextListComponent<T>::TextListComponent()
, mFont {Font::get(FONT_SIZE_MEDIUM)} , mFont {Font::get(FONT_SIZE_MEDIUM)}
, mIndicators {"symbols"} , mIndicators {"symbols"}
, mCollectionIndicators {"symbols"} , mCollectionIndicators {"symbols"}
, mGamelistView {std::is_same_v<T, FileData*> ? true : false}
, mLegacyMode {false} , mLegacyMode {false}
, mFadeAbovePrimary {false} , mFadeAbovePrimary {false}
, mLetterCase {LetterCase::NONE} , mLetterCase {LetterCase::NONE}