Merge pull request #2933 from Mailaender/hotkey-conflicts

Hotkey usability and conflict resolution
2013-04-06 01:12:39 -07:00
parent b25e29173a 3a3503201b
commit 84746c97b8
7 changed files with 30 additions and 24 deletions
--- a/OpenRA.Mods.RA/Widgets/OrderButtonWidget.cs
+++ b/OpenRA.Mods.RA/Widgets/OrderButtonWidget.cs
@@ -27,7 +27,7 @@ namespace OpenRA.Mods.RA.Widgets
 		public OrderButtonWidget()
 		{
 			GetImage = () => Enabled() ? Pressed() ? "pressed" : "normal" : "disabled";
-			GetDescription = () => Description;
+			GetDescription = () => Key != null ? "{0} ({1})".F(Description, Key.ToUpper()) : Description;
 			GetLongDesc = () => LongDesc;
 		}