epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11604 from pchote/fix-input-reset-crash

Browse Source 
Fix input reset crash
This commit is contained in:
Oliver Brakmann
2016-07-09 18:21:11 +02:00
committed by GitHub
parent 66ebbab7c1 780d6890d9
commit 3afbc637f4
1 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs
View File

@@ -450,17 +450,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ "CycleStatusBarsKey", "Cycle status bars display" },
{ "TogglePixelDoubleKey", "Toggle pixel doubling" },
{ "ToggleMuteKey", "Toggle audio mute" },
{ "TogglePlayerStanceColorsKey", "Toggle player stance colors" },
{ "MapScrollUp", "Map scroll up" },
{ "MapScrollDown", "Map scroll down" },
{ "MapScrollLeft", "Map scroll left" },
{ "MapScrollRight", "Map scroll right" },
{ "MapPushTop", "Map push to top" },
{ "MapPushBottom", "Map push to bottom" },
{ "MapPushLeftEdge", "Map push to left edge" },
{ "MapPushRightEdge", "Map push to right edge" }
{ "TogglePlayerStanceColorsKey", "Toggle player stance colors" }
};
var header = ScrollItemWidget.Setup(hotkeyHeader, returnTrue, doNothing);
@@ -471,6 +461,38 @@ namespace OpenRA.Mods.Common.Widgets.Logic
BindHotkeyPref(kv, ks, globalTemplate, hotkeyList);
}
// Viewport
{
var hotkeys = new Dictionary<string, string>()
{
{ "MapScrollUp", "Scroll up" },
{ "MapScrollDown", "Scroll down" },
{ "MapScrollLeft", "Scroll left" },
{ "MapScrollRight", "Scroll right" },
{ "MapPushTop", "Jump to top edge" },
{ "MapPushBottom", "Jump to bottom edge" },
{ "MapPushLeftEdge", "Jump to left edge" },
{ "MapPushRightEdge", "Jump to right edge" },
{ "ViewPortBookmarkSaveSlot1", "Record bookmark #1" },
{ "ViewPortBookmarkUseSlot1", "Jump to bookmark #1" },
{ "ViewPortBookmarkSaveSlot2", "Record bookmark #2" },
{ "ViewPortBookmarkUseSlot2", "Jump to bookmark #2" },
{ "ViewPortBookmarkSaveSlot3", "Record bookmark #3" },
{ "ViewPortBookmarkUseSlot3", "Jump to bookmark #3" },
{ "ViewPortBookmarkSaveSlot4", "Record bookmark #4" },
{ "ViewPortBookmarkUseSlot4", "Jump to bookmark #4" }
};
var header = ScrollItemWidget.Setup(hotkeyHeader, returnTrue, doNothing);
header.Get<LabelWidget>("LABEL").GetText = () => "Viewport Commands";
hotkeyList.AddChild(header);
foreach (var kv in hotkeys)
BindHotkeyPref(kv, ks, globalTemplate, hotkeyList);
}
// Observer
{
var hotkeys = new Dictionary<string, string>()