From 13a06c6e8d99d082d76d312a077358322d8efc04 Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Sun, 23 Jul 2017 14:18:14 +0100
Subject: [PATCH] Move hardcoded static asset browser hotkeys to yaml.

---
 OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs | 5 -----
 mods/cnc/chrome/assetbrowser.yaml                     | 5 +++++
 mods/common/chrome/assetbrowser.yaml                  | 5 +++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
index bebcb5e969..beadf72bb2 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
@@ -149,7 +149,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			var playButton = panel.GetOrNull<ButtonWidget>("BUTTON_PLAY");
 			if (playButton != null)
 			{
-				playButton.Key = new Hotkey(Keycode.SPACE, Modifiers.None);
 				playButton.OnClick = () =>
 				{
 					if (isVideoLoaded)
@@ -164,7 +163,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			var pauseButton = panel.GetOrNull<ButtonWidget>("BUTTON_PAUSE");
 			if (pauseButton != null)
 			{
-				pauseButton.Key = new Hotkey(Keycode.SPACE, Modifiers.None);
 				pauseButton.OnClick = () =>
 				{
 					if (isVideoLoaded)
@@ -179,7 +177,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			var stopButton = panel.GetOrNull<ButtonWidget>("BUTTON_STOP");
 			if (stopButton != null)
 			{
-				stopButton.Key = new Hotkey(Keycode.RETURN, Modifiers.None);
 				stopButton.OnClick = () =>
 				{
 					if (isVideoLoaded)
@@ -196,7 +193,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			var nextButton = panel.GetOrNull<ButtonWidget>("BUTTON_NEXT");
 			if (nextButton != null)
 			{
-				nextButton.Key = new Hotkey(Keycode.RIGHT, Modifiers.None);
 				nextButton.OnClick = () =>
 				{
 					if (!isVideoLoaded)
@@ -209,7 +205,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			var prevButton = panel.GetOrNull<ButtonWidget>("BUTTON_PREV");
 			if (prevButton != null)
 			{
-				prevButton.Key = new Hotkey(Keycode.LEFT, Modifiers.None);
 				prevButton.OnClick = () =>
 				{
 					if (!isVideoLoaded)
diff --git a/mods/cnc/chrome/assetbrowser.yaml b/mods/cnc/chrome/assetbrowser.yaml
index 4215647a2a..847e98425b 100644
--- a/mods/cnc/chrome/assetbrowser.yaml
+++ b/mods/cnc/chrome/assetbrowser.yaml
@@ -119,6 +119,7 @@ Container@ASSETBROWSER_PANEL:
 						Button@BUTTON_PREV:
 							Width: 26
 							Height: 26
+							Key: LEFT
 							Children:
 								Image@IMAGE_PREV:
 									X: 5
@@ -131,6 +132,7 @@ Container@ASSETBROWSER_PANEL:
 							X: 35
 							Width: 26
 							Height: 26
+							Key: SPACE
 							Children:
 								Image@IMAGE_PLAY:
 									X: 5
@@ -144,6 +146,7 @@ Container@ASSETBROWSER_PANEL:
 							X: 35
 							Width: 26
 							Height: 26
+							Key: SPACE
 							Children:
 								Image@IMAGE_PAUSE:
 									X: 5
@@ -156,6 +159,7 @@ Container@ASSETBROWSER_PANEL:
 							X: 70
 							Width: 26
 							Height: 26
+							Key: RETURN
 							Children:
 								Image@IMAGE_STOP:
 									X: 5
@@ -168,6 +172,7 @@ Container@ASSETBROWSER_PANEL:
 							X: 105
 							Width: 26
 							Height: 26
+							Key: RIGHT
 							Children:
 								Image@IMAGE_NEXT:
 									X: 5
diff --git a/mods/common/chrome/assetbrowser.yaml b/mods/common/chrome/assetbrowser.yaml
index 6f942e1bee..ce413acf2f 100644
--- a/mods/common/chrome/assetbrowser.yaml
+++ b/mods/common/chrome/assetbrowser.yaml
@@ -116,6 +116,7 @@ Background@ASSETBROWSER_PANEL:
 					Y: 0
 					Width: 25
 					Height: 25
+					Key: LEFT
 					Children:
 						Image@IMAGE_PREV:
 							X: 0
@@ -129,6 +130,7 @@ Background@ASSETBROWSER_PANEL:
 					Y: 0
 					Width: 25
 					Height: 25
+					Key: SPACE
 					Children:
 						Image@IMAGE_PLAY:
 							X: 0
@@ -143,6 +145,7 @@ Background@ASSETBROWSER_PANEL:
 					Y: 0
 					Width: 25
 					Height: 25
+					Key: SPACE
 					Children:
 						Image@IMAGE_PAUSE:
 							X: 0
@@ -156,6 +159,7 @@ Background@ASSETBROWSER_PANEL:
 					Y: 0
 					Width: 25
 					Height: 25
+					Key: RETURN
 					Children:
 						Image@IMAGE_STOP:
 							X: 0
@@ -169,6 +173,7 @@ Background@ASSETBROWSER_PANEL:
 					Y: 0
 					Width: 25
 					Height: 25
+					Key: RIGHT
 					Children:
 						Image@IMAGE_NEXT:
 							X: 0