Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Ahelp in lobby (#708)

Browse Source
This commit is contained in:
Jabak
2024-09-25 19:56:09 +03:00
committed by GitHub
parent 4de84b6fa3
commit 982185a2bb
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Client/Lobby/UI/LobbyGui.xaml
View File

@@ -41,9 +41,6 @@
<info:LinkBanner Name="LinkBanner" VerticalExpand="True" HorizontalAlignment="Center" /> <info:LinkBanner Name="LinkBanner" VerticalExpand="True" HorizontalAlignment="Center" />
<Button Name="AHelpButton" Access="Public" Text="{Loc 'ui-lobby-ahelp-button'}"
StyleClasses="Button" />
</BoxContainer> </BoxContainer>
</BoxContainer> </BoxContainer>
@@ -99,6 +96,12 @@
ButtonText="Options" ButtonText="Options"
Margin="0 10 0 10" /> Margin="0 10 0 10" />
<buttons:OhioLobbyTextButton
Name="AHelpButton"
Access="Public"
ButtonText="AHelp"
Margin="0 10 0 10" />
<buttons:OhioLobbyTextButton <buttons:OhioLobbyTextButton
Name="DiscordButton" Name="DiscordButton"
Access="Public" Access="Public"

5
Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
View File

@@ -1,6 +1,7 @@
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Linq; using System.Linq;
using System.Numerics; using System.Numerics;
using Content.Client._Ohio.Buttons;
using Content.Client.Administration.Managers; using Content.Client.Administration.Managers;
using Content.Client.Administration.Systems; using Content.Client.Administration.Systems;
using Content.Client.Administration.UI.Bwoink; using Content.Client.Administration.UI.Bwoink;
@@ -45,7 +46,7 @@ public sealed class AHelpUIController: UIController, IOnSystemChanged<BwoinkSyst
private BwoinkSystem? _bwoinkSystem; private BwoinkSystem? _bwoinkSystem;
private MenuButton? GameAHelpButton => UIManager.GetActiveUIWidgetOrNull<GameTopMenuBar>()?.AHelpButton; private MenuButton? GameAHelpButton => UIManager.GetActiveUIWidgetOrNull<GameTopMenuBar>()?.AHelpButton;
private Button? LobbyAHelpButton => (UIManager.ActiveScreen as LobbyGui)?.AHelpButton; private OhioLobbyTextButton? LobbyAHelpButton => (UIManager.ActiveScreen as LobbyGui)?.AHelpButton;
public IAHelpUIHandler? UIHelper; public IAHelpUIHandler? UIHelper;
private bool _discordRelayActive; private bool _discordRelayActive;
private bool _hasUnreadAHelp; private bool _hasUnreadAHelp;
@@ -192,7 +193,7 @@ public sealed class AHelpUIController: UIController, IOnSystemChanged<BwoinkSyst
UIHelper = isAdmin ? new AdminAHelpUIHandler(ownerUserId) : new UserAHelpUIHandler(ownerUserId); UIHelper = isAdmin ? new AdminAHelpUIHandler(ownerUserId) : new UserAHelpUIHandler(ownerUserId);
UIHelper.DiscordRelayChanged(_discordRelayActive); UIHelper.DiscordRelayChanged(_discordRelayActive);
UIHelper.SendMessageAction = (userId, textMessage, playSound) => UIHelper.SendMessageAction = (userId, textMessage, playSound) =>
_bwoinkSystem?.Send(userId, textMessage, isAdmin, playSound); _bwoinkSystem?.Send(userId, textMessage, isAdmin, playSound);
UIHelper.InputTextChanged += (channel, text) => _bwoinkSystem?.SendInputTextUpdated(channel, text.Length > 0); UIHelper.InputTextChanged += (channel, text) => _bwoinkSystem?.SendInputTextUpdated(channel, text.Length > 0);
UIHelper.OnClose += () => { SetAHelpPressed(false); }; UIHelper.OnClose += () => { SetAHelpPressed(false); };