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

Remove hardcoded DevReloadChrome and HideUserInterface hotkeys.

Browse Source
This commit is contained in:
Paul Chote
2017-09-03 15:15:06 +00:00
committed by reaperrr
parent 25e88008ef
commit 983f9c4cde
3 changed files with 2 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Settings.cs
View File

@@ -239,8 +239,6 @@ namespace OpenRA
public Hotkey TogglePixelDoubleKey = new Hotkey(Keycode.PERIOD, Modifiers.None); public Hotkey TogglePixelDoubleKey = new Hotkey(Keycode.PERIOD, Modifiers.None);
public Hotkey TogglePlayerStanceColorsKey = new Hotkey(Keycode.COMMA, Modifiers.Ctrl); public Hotkey TogglePlayerStanceColorsKey = new Hotkey(Keycode.COMMA, Modifiers.Ctrl);
public Hotkey DevReloadChromeKey = new Hotkey(Keycode.C, Modifiers.Ctrl | Modifiers.Shift);
public Hotkey HideUserInterfaceKey = new Hotkey(Keycode.H, Modifiers.Ctrl | Modifiers.Shift);
public Hotkey TakeScreenshotKey = new Hotkey(Keycode.P, Modifiers.Ctrl); public Hotkey TakeScreenshotKey = new Hotkey(Keycode.P, Modifiers.Ctrl);
public Hotkey ToggleMuteKey = new Hotkey(Keycode.M, Modifiers.None); public Hotkey ToggleMuteKey = new Hotkey(Keycode.M, Modifiers.None);

17
OpenRA.Game/Widgets/Widget.cs
View File

@@ -128,23 +128,6 @@ namespace OpenRA.Widgets
/// <param name="e">Key input data</param> /// <param name="e">Key input data</param>
public static bool HandleKeyPress(KeyInput e) public static bool HandleKeyPress(KeyInput e)
{ {
if (e.Event == KeyInputEvent.Down)
{
var hk = Hotkey.FromKeyInput(e);
if (hk == Game.Settings.Keys.DevReloadChromeKey)
{
ChromeProvider.Initialize(Game.ModData);
return true;
}
if (hk == Game.Settings.Keys.HideUserInterfaceKey)
{
Root.Visible ^= true;
return true;
}
}
if (KeyboardFocusWidget != null) if (KeyboardFocusWidget != null)
return KeyboardFocusWidget.HandleKeyPressOuter(e); return KeyboardFocusWidget.HandleKeyPressOuter(e);

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

@@ -448,7 +448,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ "CycleStatusBarsKey", "Cycle status bars display" }, { "CycleStatusBarsKey", "Cycle status bars display" },
{ "TogglePixelDoubleKey", "Toggle pixel doubling" }, { "TogglePixelDoubleKey", "Toggle pixel doubling" },
{ "ToggleMuteKey", "Toggle audio mute" }, { "ToggleMuteKey", "Toggle audio mute" },
{ "TogglePlayerStanceColorsKey", "Toggle player stance colors" } { "TogglePlayerStanceColorsKey", "Toggle player stance colors" },
{ "TakeScreenshotKey", "Take screenshot" }
}; };
var header = ScrollItemWidget.Setup(hotkeyHeader, returnTrue, doNothing); var header = ScrollItemWidget.Setup(hotkeyHeader, returnTrue, doNothing);
@@ -589,23 +590,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
BindHotkeyPref(kv, ks, productionTemplate, hotkeyList); BindHotkeyPref(kv, ks, productionTemplate, hotkeyList);
} }
// Developer
{
var hotkeys = new Dictionary<string, string>()
{
{ "DevReloadChromeKey", "Reload Chrome" },
{ "HideUserInterfaceKey", "Hide UI" },
{ "TakeScreenshotKey", "Take screenshot" }
};
var header = ScrollItemWidget.Setup(hotkeyHeader, returnTrue, doNothing);
header.Get<LabelWidget>("LABEL").GetText = () => "Developer Commands";
hotkeyList.AddChild(header);
foreach (var kv in hotkeys)
BindHotkeyPref(kv, ks, developerTemplate, hotkeyList);
}
// Music // Music
{ {
var hotkeys = new Dictionary<string, string>() var hotkeys = new Dictionary<string, string>()