Remove key handling from ContainerWidget

It has no business handling key input. This was used only for opening the ingame chat and replacing it with a `LogicKeyListener` was trivial.
dragunoff · Oct 4, 2024 · e2b7a87 · e2b7a87
1 parent a69ea79
commit e2b7a87
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/OpenRA.Game/Widgets/Widget.cs b/OpenRA.Game/Widgets/Widget.cs
@@ -632,8 +632,6 @@ public ContainerWidget(ContainerWidget other)
 
 		public override string GetCursor(int2 pos) { return null; }
 		public override Widget Clone() { return new ContainerWidget(this); }
-		public Func<KeyInput, bool> OnKeyPress = _ => false;
-		public override bool HandleKeyPress(KeyInput e) { return OnKeyPress(e); }
 
 		public override bool HandleMouseInput(MouseInput mi)
 		{

diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameChatLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameChatLogic.cs
@@ -209,7 +209,9 @@ public IngameChatLogic(Widget widget, OrderManager orderManager, World world, Mo
 				var chatClose = chatChrome.Get<ButtonWidget>("CHAT_CLOSE");
 				chatClose.OnClick += CloseChat;
 
-				chatPanel.OnKeyPress = e =>
+				var openChatKeyListener = chatPanel.Get<LogicKeyListenerWidget>("OPEN_CHAT_KEY_LISTENER");
+
+				openChatKeyListener.AddHandler(e =>
 				{
 					if (e.Event == KeyInputEvent.Up)
 						return false;
@@ -223,7 +225,7 @@ public IngameChatLogic(Widget widget, OrderManager orderManager, World world, Mo
 					}
 
 					return false;
-				};
+				});
 			}
 
 			chatScrollPanel = chatChrome.Get<ScrollPanelWidget>("CHAT_SCROLLPANEL");

diff --git a/mods/cnc/chrome/ingame-chat.yaml b/mods/cnc/chrome/ingame-chat.yaml
@@ -11,6 +11,7 @@ Container@CHAT_PANEL:
 			System: SYSTEM_LINE_TEMPLATE
 			Mission: CHAT_LINE_TEMPLATE
 	Children:
+		LogicKeyListener@OPEN_CHAT_KEY_LISTENER:
 		Container@CHAT_OVERLAY:
 			Width: PARENT_RIGHT - 24
 			Height: PARENT_BOTTOM - 30

diff --git a/mods/common/chrome/ingame-chat.yaml b/mods/common/chrome/ingame-chat.yaml
@@ -11,6 +11,7 @@ Container@CHAT_PANEL:
 			System: SYSTEM_LINE_TEMPLATE
 			Mission: CHAT_LINE_TEMPLATE
 	Children:
+		LogicKeyListener@OPEN_CHAT_KEY_LISTENER:
 		Container@CHAT_OVERLAY:
 			Width: PARENT_RIGHT - 24
 			Height: PARENT_BOTTOM - 30