From 7c2802b4c335b33d8abae46ef6fcd21ea779f002 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 29 Mar 2020 14:41:42 -0500
Subject: [PATCH] DS - change to incrmeent/decrement view hotkeys instead of
 just one that increments

---
 BizHawk.Client.Common/config/Binding.cs   |  3 +-
 BizHawk.Client.EmuHawk/MainForm.Hotkey.cs | 46 +++++++++++++++--------
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/BizHawk.Client.Common/config/Binding.cs b/BizHawk.Client.Common/config/Binding.cs
index 3def99d103..426fec03c3 100644
--- a/BizHawk.Client.Common/config/Binding.cs
+++ b/BizHawk.Client.Common/config/Binding.cs
@@ -257,7 +257,8 @@ namespace BizHawk.Client.Common
 
 						Bind("Tools", "Toggle All Cheats"),
 
-						Bind("DS", "Toggle View")
+						Bind("DS", "Increment View"),
+						Bind("DS", "Decrement View"),
 					};
 
 					// set ordinals based on order in list
diff --git a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
index b452f4480b..be48c60357 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
@@ -756,28 +756,42 @@ namespace BizHawk.Client.EmuHawk
 					break;
 
 				// DS
-				case "Toggle View":
-					if (Emulator is MelonDS ds)
-					{
-						var settings = ds.GetSettings();
-						var num = (int)settings.ScreenOptions;
-						num++;
-						var next = (MelonDS.VideoScreenOptions)Enum.Parse(typeof(MelonDS.VideoScreenOptions), num.ToString());
-						if (!typeof(MelonDS.VideoScreenOptions).IsEnumDefined(next))
-						{
-							next = default;
-						}
-
-						settings.ScreenOptions = next;
-						ds.PutSettings(settings);
-					}
-
+				case "Increment View":
+					ToggleDSView();
+					break;
+				case "Decrement View":
+					ToggleDSView(true);
 					break;
 			}
 
 			return true;
 		}
 
+		private void ToggleDSView(bool decrement = false)
+		{
+			if (Emulator is MelonDS ds)
+			{
+				var settings = ds.GetSettings();
+				var num = (int)settings.ScreenOptions;
+				if (decrement)
+				{
+					num--;
+				}
+				else
+				{
+					num++;
+				}
+				var next = (MelonDS.VideoScreenOptions)Enum.Parse(typeof(MelonDS.VideoScreenOptions), num.ToString());
+				if (!typeof(MelonDS.VideoScreenOptions).IsEnumDefined(next))
+				{
+					next = default;
+				}
+
+				settings.ScreenOptions = next;
+				ds.PutSettings(settings);
+			}
+		}
+
 		// Determines if the value is a hotkey  that would be handled outside of the CheckHotkey method
 		private bool IsInternalHotkey(string trigger)
 		{