tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More UI fixes (#22431)

Browse Source 
* Fix chat filter button

Oh look, the popup code was copy pasted between chat filter and channel selector.

Hilarious.

Anyways same stuff as 995f506aaf. I pulled it all out into a base class so NO MORE COPY PASTE.

Fixes #22360

* Remove all further EnableAllKeybinds buttons.

Fixes #22346

Yeah none of these are valid use cases, why is this set...
This commit is contained in:
Pieter-Jan Briers
2023-12-13 03:02:19 +01:00
committed by GitHub
parent 93f8c4ef60
commit 16bd6802df
12 changed files with 113 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
View File

@@ -36,7 +36,7 @@ public partial class ChatBox : UIWidget
ChatInput.Input.OnKeyBindDown += OnKeyBindDown;
ChatInput.Input.OnTextChanged += OnTextChanged;
ChatInput.ChannelSelector.OnChannelSelect += OnChannelSelect;
ChatInput.FilterButton.ChatFilterPopup.OnChannelFilter += OnChannelFilter;
ChatInput.FilterButton.Popup.OnChannelFilter += OnChannelFilter;
_controller = UserInterfaceManager.GetUIController<ChatUIController>();
_controller.MessageAdded += OnMessageAdded;
@@ -51,7 +51,7 @@ public partial class ChatBox : UIWidget
private void OnMessageAdded(ChatMessage msg)
{
Logger.DebugS("chat", $"{msg.Channel}: {msg.Message}");
if (!ChatInput.FilterButton.ChatFilterPopup.IsActive(msg.Channel))
if (!ChatInput.FilterButton.Popup.IsActive(msg.Channel))
{
return;
}