From 9d6a5d626f9955abde077bc67c7c31b0dbb780aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 28 Jun 2015 15:48:11 +0200 Subject: [PATCH] fix developer hotkey display being cut off --- OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs | 3 ++- mods/cnc/chrome/settings.yaml | 14 ++++++++++++++ mods/ra/chrome/settings.yaml | 14 ++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs index d95086f2b8..88d65fb469 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs @@ -346,6 +346,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic var globalTemplate = hotkeyList.Get("GLOBAL_TEMPLATE"); var unitTemplate = hotkeyList.Get("UNIT_TEMPLATE"); var productionTemplate = hotkeyList.Get("PRODUCTION_TEMPLATE"); + var developerTemplate = hotkeyList.Get("DEVELOPER_TEMPLATE"); hotkeyList.RemoveChildren(); Func returnTrue = () => true; @@ -473,7 +474,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic hotkeyList.AddChild(header); foreach (var kv in hotkeys) - BindHotkeyPref(kv, ks, globalTemplate, hotkeyList); + BindHotkeyPref(kv, ks, developerTemplate, hotkeyList); } return () => diff --git a/mods/cnc/chrome/settings.yaml b/mods/cnc/chrome/settings.yaml index e20b0219f5..5da00aea63 100644 --- a/mods/cnc/chrome/settings.yaml +++ b/mods/cnc/chrome/settings.yaml @@ -451,6 +451,20 @@ Container@SETTINGS_PANEL: X: PARENT_RIGHT-WIDTH+1 Width: 80 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: Width: PARENT_RIGHT Height: PARENT_BOTTOM diff --git a/mods/ra/chrome/settings.yaml b/mods/ra/chrome/settings.yaml index 846da5cf86..3b994fd5cc 100644 --- a/mods/ra/chrome/settings.yaml +++ b/mods/ra/chrome/settings.yaml @@ -456,6 +456,20 @@ Background@SETTINGS_PANEL: X: PARENT_RIGHT-WIDTH+1 Width: 80 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: X: 5 Y: 50