fix arrow key binding breaking up-down combo to close folder

etternagame · Jun 26, 2021 · 0537ace · 0537ace
1 parent 2d9f5ff
commit 0537ace
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/Themes/Til Death/metrics.ini b/Themes/Til Death/metrics.ini
@@ -46,7 +46,8 @@ Mines=GetCodeForGame("Mines")
 CancelAll=GetCodeForGame("CancelAll")
 NextGroup=GetCodeForGame("NextGroup")
 PrevGroup=GetCodeForGame("PrevGroup")
-CloseCurrentFolder=GetCodeForGame("CloseCurrentFolder")
+CloseCurrentFolder1=GetCodeForGame("CloseCurrentFolder1")
+CloseCurrentFolder2=GetCodeForGame("CloseCurrentFolder2")
 Hidden=GetCodeForGame("Hidden")
 SaveScreenshot1=GetCodeForGame("SaveScreenshot1")
 SaveScreenshot2=GetCodeForGame("SaveScreenshot2")

diff --git a/Themes/_fallback/Scripts/03 Gameplay.lua b/Themes/_fallback/Scripts/03 Gameplay.lua
@@ -292,9 +292,12 @@ local CodeDetectorCodes = {
 		solo = "",
 		pump = ""
 	},
-	CloseCurrentFolder = {
+	CloseCurrentFolder1 = {
 		default = "MenuUp-MenuDown"
 	},
+	CloseCurrentFolder2 = {
+		default = "Up-Down"
+	},
 	-- sorts
 	NextSort1 = {
 		default = "@MenuLeft-@MenuRight-Start",

diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
@@ -237,7 +237,8 @@ Dark=GetCodeForGame("Dark")
 CancelAll=GetCodeForGame("CancelAll")
 NextGroup=GetCodeForGame("NextGroup")
 PrevGroup=GetCodeForGame("PrevGroup")
-CloseCurrentFolder=GetCodeForGame("CloseCurrentFolder")
+CloseCurrentFolder1=GetCodeForGame("CloseCurrentFolder1")
+CloseCurrentFolder2=GetCodeForGame("CloseCurrentFolder2")
 Hidden=GetCodeForGame("Hidden")
 SaveScreenshot1=GetCodeForGame("SaveScreenshot1")
 SaveScreenshot2=GetCodeForGame("SaveScreenshot2")

diff --git a/src/Etterna/Models/Misc/CodeDetector.cpp b/src/Etterna/Models/Misc/CodeDetector.cpp
@@ -38,7 +38,8 @@ const char* CodeNames[] = {
 	"SaveScreenshot1",
 	"SaveScreenshot2",
 	"CancelAllPlayerOptions",
-	"CloseCurrentFolder",
+	"CloseCurrentFolder1",
+	"CloseCurrentFolder2",
 };
 XToString(Code);
 
@@ -68,7 +69,8 @@ CodeDetector::RefreshCacheItems(std::string sClass)
 bool
 CodeDetector::EnteredCloseFolder(GameController controller)
 {
-	return EnteredCode(controller, CODE_CLOSE_CURRENT_FOLDER);
+	return EnteredCode(controller, CODE_CLOSE_CURRENT_FOLDER1) ||
+		   EnteredCode(controller, CODE_CLOSE_CURRENT_FOLDER2);
 }
 
 bool

diff --git a/src/Etterna/Models/Misc/CodeDetector.h b/src/Etterna/Models/Misc/CodeDetector.h
@@ -34,7 +34,8 @@ enum Code
 	CODE_SAVE_SCREENSHOT1,
 	CODE_SAVE_SCREENSHOT2,
 	CODE_CANCEL_ALL_PLAYER_OPTIONS,
-	CODE_CLOSE_CURRENT_FOLDER,
+	CODE_CLOSE_CURRENT_FOLDER1,
+	CODE_CLOSE_CURRENT_FOLDER2,
 	NUM_Code // leave this at the end
 };