From afa3b92fe9ba7c191c21644fbf081c4dde8cd2d9 Mon Sep 17 00:00:00 2001 From: Llennpie Date: Tue, 6 Jul 2021 20:02:32 -0400 Subject: [PATCH] Fix menu sensitivity when using a gamepad --- src/moon/ui/interfaces/moon-screen.cpp | 4 ++-- src/moon/ui/screens/achievements/achievements-view.cpp | 4 ++-- src/moon/ui/screens/addons/addons-view.cpp | 4 ++-- src/moon/ui/screens/options/main-view.cpp | 4 ++-- src/moon/ui/screens/store/store-view.cpp | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/moon/ui/interfaces/moon-screen.cpp b/src/moon/ui/interfaces/moon-screen.cpp index 823c3efd..db63d779 100644 --- a/src/moon/ui/interfaces/moon-screen.cpp +++ b/src/moon/ui/interfaces/moon-screen.cpp @@ -99,7 +99,7 @@ void MoonScreen::Update(){ widgets[i]->Update(); } float yStick = GetStickValue(MoonButtons::U_STICK, false); - if(yStick > 0) { + if(yStick > 5) { if(stickExecuted) return; if(this->selected != NULL) return; this->widgets[this->scrollIndex]->selected = false; @@ -109,7 +109,7 @@ void MoonScreen::Update(){ this->widgets[this->scrollIndex]->selected = true; stickExecuted = true; } - if(yStick < 0) { + if(yStick < -5) { if(stickExecuted) return; if(this->selected != NULL) return; this->widgets[this->scrollIndex]->selected = false; diff --git a/src/moon/ui/screens/achievements/achievements-view.cpp b/src/moon/ui/screens/achievements/achievements-view.cpp index c2e8ea4d..8c3b2e9d 100644 --- a/src/moon/ui/screens/achievements/achievements-view.cpp +++ b/src/moon/ui/screens/achievements/achievements-view.cpp @@ -64,12 +64,12 @@ void MoonAchievementsScreen::changeScroll(int idx){ void MoonAchievementsScreen::Update(){ float yStick = GetStickValue(MoonButtons::U_STICK, false); - if(yStick > 0) { + if(yStick > 5) { if(dispatched) return; MoonAchievementsScreen::changeScroll(-1); dispatched = true; } - if(yStick < 0) { + if(yStick < -5) { if(dispatched) return; MoonAchievementsScreen::changeScroll(1); dispatched = true; diff --git a/src/moon/ui/screens/addons/addons-view.cpp b/src/moon/ui/screens/addons/addons-view.cpp index 54cbba5e..fbeaa920 100644 --- a/src/moon/ui/screens/addons/addons-view.cpp +++ b/src/moon/ui/screens/addons/addons-view.cpp @@ -83,7 +83,7 @@ void MoonAddonsScreen::changeScroll(int idx){ void MoonAddonsScreen::Update(){ float yStick = GetStickValue(MoonButtons::U_STICK, false); - if(yStick > 0) { + if(yStick > 5) { if(dispatched) return; if(currentPack != NULL){ if(currentSubItem > 0) @@ -96,7 +96,7 @@ void MoonAddonsScreen::Update(){ MoonAddonsScreen::changeScroll(-1); dispatched = true; } - if(yStick < 0) { + if(yStick < -5) { if(dispatched) return; if(currentPack != NULL){ if(currentSubItem < 2) diff --git a/src/moon/ui/screens/options/main-view.cpp b/src/moon/ui/screens/options/main-view.cpp index fd00a133..234b1437 100644 --- a/src/moon/ui/screens/options/main-view.cpp +++ b/src/moon/ui/screens/options/main-view.cpp @@ -81,7 +81,7 @@ void MoonOptMain::Update(){ isOpen = false; } float xStick = GetStickValue(MoonButtons::L_STICK, false); - if(xStick < 0) { + if(xStick < -50) { if(cswStickExecuted) return; if(categoryIndex > 0) categoryIndex -= 1; @@ -90,7 +90,7 @@ void MoonOptMain::Update(){ this->setCategory(categoryIndex); cswStickExecuted = true; } - if(xStick > 0) { + if(xStick > 50) { if(cswStickExecuted) return; if(categoryIndex < categories.size() - 1) categoryIndex += 1; diff --git a/src/moon/ui/screens/store/store-view.cpp b/src/moon/ui/screens/store/store-view.cpp index 36719320..5957d5c4 100644 --- a/src/moon/ui/screens/store/store-view.cpp +++ b/src/moon/ui/screens/store/store-view.cpp @@ -80,7 +80,7 @@ void MoonStoreScreen::changeScroll(int idx){ void MoonStoreScreen::Update(){ float yStick = GetStickValue(MoonButtons::U_STICK, false); - if(yStick > 0) { + if(yStick > 5) { if(dispatched) return; if(currentPack != NULL){ if(currentSubItem > 0) @@ -93,7 +93,7 @@ void MoonStoreScreen::Update(){ MoonStoreScreen::changeScroll(-1); dispatched = true; } - if(yStick < 0) { + if(yStick < -5) { if(dispatched) return; if(currentPack != NULL){ if(currentSubItem < 2)