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

Merge pull request #8582 from Mailaender/hide-ui-hotkey

Browse Source 
Added a hide UI hotkey
This commit is contained in:
Oliver Brakmann
2015-06-29 20:16:40 +02:00
parent 699822cd51 5c0c300c53
commit f8eb2fadf7
5 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Game/Settings.cs
View File

@@ -181,6 +181,7 @@ namespace OpenRA
public Hotkey TogglePixelDoubleKey = new Hotkey(Keycode.PERIOD, Modifiers.None); public Hotkey TogglePixelDoubleKey = new Hotkey(Keycode.PERIOD, Modifiers.None);
public Hotkey DevReloadChromeKey = new Hotkey(Keycode.C, Modifiers.Ctrl | Modifiers.Shift); 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 Production01Key = new Hotkey(Keycode.F1, Modifiers.None); public Hotkey Production01Key = new Hotkey(Keycode.F1, Modifiers.None);

8
OpenRA.Game/Widgets/RootWidget.cs
View File

@@ -31,6 +31,14 @@ namespace OpenRA.Widgets
return true; return true;
} }
if (hk == Game.Settings.Keys.HideUserInterfaceKey)
{
foreach (var child in this.Children)
child.Visible ^= true;
return true;
}
if (hk == Game.Settings.Keys.TakeScreenshotKey) if (hk == Game.Settings.Keys.TakeScreenshotKey)
{ {
if (e.Event == KeyInputEvent.Down) if (e.Event == KeyInputEvent.Down)

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

@@ -346,6 +346,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var globalTemplate = hotkeyList.Get("GLOBAL_TEMPLATE"); var globalTemplate = hotkeyList.Get("GLOBAL_TEMPLATE");
var unitTemplate = hotkeyList.Get("UNIT_TEMPLATE"); var unitTemplate = hotkeyList.Get("UNIT_TEMPLATE");
var productionTemplate = hotkeyList.Get("PRODUCTION_TEMPLATE"); var productionTemplate = hotkeyList.Get("PRODUCTION_TEMPLATE");
var developerTemplate = hotkeyList.Get("DEVELOPER_TEMPLATE");
hotkeyList.RemoveChildren(); hotkeyList.RemoveChildren();
Func<bool> returnTrue = () => true; Func<bool> returnTrue = () => true;
@@ -465,6 +466,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var hotkeys = new Dictionary<string, string>() var hotkeys = new Dictionary<string, string>()
{ {
{ "DevReloadChromeKey", "Reload Chrome" }, { "DevReloadChromeKey", "Reload Chrome" },
{ "HideUserInterfaceKey", "Hide UI" },
{ "TakeScreenshotKey", "Take screenshot" } { "TakeScreenshotKey", "Take screenshot" }
}; };
@@ -473,7 +475,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
hotkeyList.AddChild(header); hotkeyList.AddChild(header);
foreach (var kv in hotkeys) foreach (var kv in hotkeys)
BindHotkeyPref(kv, ks, globalTemplate, hotkeyList); BindHotkeyPref(kv, ks, developerTemplate, hotkeyList);
} }
return () => return () =>

14
mods/cnc/chrome/settings.yaml
View File

@@ -451,6 +451,20 @@ Container@SETTINGS_PANEL:
X: PARENT_RIGHT-WIDTH+1 X: PARENT_RIGHT-WIDTH+1
Width: 80 Width: 80
Height: 25 Height: 25
Container@DEVELOPER_TEMPLATE:
Width: 262
Height: 25
Visible: false
Children:
Label@FUNCTION:
Y: 0-1
Width: PARENT_RIGHT - 115
Height: 25
Align: Right
HotkeyEntry@HOTKEY:
X: PARENT_RIGHT-WIDTH
Width: 110
Height: 25
Container@ADVANCED_PANEL: Container@ADVANCED_PANEL:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: PARENT_BOTTOM Height: PARENT_BOTTOM

14
mods/ra/chrome/settings.yaml
View File

@@ -456,6 +456,20 @@ Background@SETTINGS_PANEL:
X: PARENT_RIGHT-WIDTH+1 X: PARENT_RIGHT-WIDTH+1
Width: 80 Width: 80
Height: 25 Height: 25
Container@DEVELOPER_TEMPLATE:
Width: 262
Height: 25
Visible: false
Children:
Label@FUNCTION:
Y: 0-1
Width: PARENT_RIGHT - 115
Height: 25
Align: Right
HotkeyEntry@HOTKEY:
X: PARENT_RIGHT-WIDTH
Width: 110
Height: 25
Container@ADVANCED_PANEL: Container@ADVANCED_PANEL:
X: 5 X: 5
Y: 50 Y: 50