Add duplicate hotkey tracking with a boolean property on the definition

OpenRA · Oct 5, 2019 · 9d98276 · 9d98276
1 parent 7ecc653
commit 9d98276
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/OpenRA.Game/HotkeyDefinition.cs b/OpenRA.Game/HotkeyDefinition.cs
@@ -20,6 +20,7 @@ public sealed class HotkeyDefinition
 		public readonly Hotkey Default = Hotkey.Invalid;
 		public readonly string Description = "";
 		public readonly HashSet<string> Types = new HashSet<string>();
+		public bool HasDuplicates = false;
 
 		public HotkeyDefinition(string name, MiniYaml node)
 		{

diff --git a/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs
@@ -149,9 +149,7 @@ void BindHotkeyPref(HotkeyDefinition hd, Widget template, Widget parent)
 
 			remapButton.GetColor = () =>
 			{
-				return modData.Hotkeys.GetFirstDuplicate(hd.Name, modData.Hotkeys[hd.Name].GetValue(), hd) != null ?
-					hotkeyInvalidColor :
-					hotkeyValidColor;
+				return hd.HasDuplicates ? hotkeyInvalidColor : hotkeyValidColor;
 			};
 
 			if (selectedHotkeyDefinition == hd)
@@ -492,6 +490,9 @@ Action InitHotkeysPanel(Widget panel)
 								if (selectedHotkeyDefinition == null)
 									selectedHotkeyDefinition = hd;
 
+								if (modData.Hotkeys.GetFirstDuplicate(hd.Name, modData.Hotkeys[hd.Name].GetValue(), hd) != null)
+									hd.HasDuplicates = true;
+
 								BindHotkeyPref(hd, template, hotkeyList);
 							}
 						}
@@ -800,6 +801,9 @@ void SaveHotkey()
 			WidgetUtils.TruncateButtonToTooltip(selectedHotkeyButton, hotkeyEntryWidget.Key.DisplayString());
 			modData.Hotkeys.Set(selectedHotkeyDefinition.Name, hotkeyEntryWidget.Key);
 			Game.Settings.Save();
+
+			foreach (var hd in modData.Hotkeys.Definitions)
+				hd.HasDuplicates = modData.Hotkeys.GetFirstDuplicate(hd.Name, modData.Hotkeys[hd.Name].GetValue(), hd) != null;
 		}
 
 		void ResetHotkey()