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

Make lobby ready button clear what state you are in (#12152)

Browse Source
This commit is contained in:
theashtronaut
2022-11-04 00:51:25 +00:00
committed by GitHub
parent e5aa4ecd59
commit 794e3504f2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Lobby/LobbyState.cs
View File

@@ -180,7 +180,7 @@ namespace Content.Client.Lobby
else else
{ {
_lobby!.StartTime.Text = string.Empty; _lobby!.StartTime.Text = string.Empty;
_lobby!.ReadyButton.Text = Loc.GetString("lobby-state-ready-button-ready-up-state"); _lobby!.ReadyButton.Text = Loc.GetString(_lobby!.ReadyButton.Pressed ? "lobby-state-player-status-ready": "lobby-state-player-status-not-ready");
_lobby!.ReadyButton.ToggleMode = true; _lobby!.ReadyButton.ToggleMode = true;
_lobby!.ReadyButton.Disabled = false; _lobby!.ReadyButton.Disabled = false;
_lobby!.ReadyButton.Pressed = _gameTicker.AreWeReady; _lobby!.ReadyButton.Pressed = _gameTicker.AreWeReady;

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

@@ -24,11 +24,11 @@
<cc:UICommandButton Command="observe" Name="ObserveButton" Access="Public" Text="{Loc 'ui-lobby-observe-button'}" StyleClasses="ButtonBig" WindowType="{x:Type lobbyUi:ObserveWarningWindow}"/> <cc:UICommandButton Command="observe" Name="ObserveButton" Access="Public" Text="{Loc 'ui-lobby-observe-button'}" StyleClasses="ButtonBig" WindowType="{x:Type lobbyUi:ObserveWarningWindow}"/>
<Label Name="StartTime" <Label Name="StartTime"
Access="Public" Access="Public"
Align="Right" Align="Left"
FontColorOverride="{x:Static maths:Color.DarkGray}" FontColorOverride="{x:Static maths:Color.DarkGray}"
StyleClasses="LabelBig" HorizontalExpand="True" /> StyleClasses="LabelBig" HorizontalExpand="True" />
<Button Name="ReadyButton" Access="Public" ToggleMode="True" Text="{Loc 'ui-lobby-ready-up-button'}" <Button Name="ReadyButton" Access="Public" ToggleMode="True" Text="{Loc 'ui-lobby-ready-up-button'}"
StyleClasses="ButtonBig" /> StyleClasses="ButtonBig" MinWidth="137"/>
</BoxContainer> </BoxContainer>
</controls:StripeBack> </controls:StripeBack>
</BoxContainer> </BoxContainer>