From 4cb3e464ac9686aef610d532568a88fa5c4ec3f3 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sun, 2 Apr 2023 01:00:48 +1100
Subject: [PATCH] Fix lobby votes (#15041)

---
 Content.Client/Lobby/LobbyState.cs            |  4 ++
 Content.Client/Lobby/UI/LobbyGui.xaml         | 42 ++++++++++---------
 .../Systems/Vote/VoteUIController.cs          |  2 +
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs
index 02efe0daa1..8774242cc6 100644
--- a/Content.Client/Lobby/LobbyState.cs
+++ b/Content.Client/Lobby/LobbyState.cs
@@ -59,6 +59,8 @@ namespace Content.Client.Lobby
             _lobby.CharacterSetupState.AddChild(_characterSetup);
             chatController.SetMainChat(true);
 
+            _voteManager.SetPopupContainer(_lobby.VoteContainer);
+
             _characterSetup.CloseButton.OnPressed += _ =>
             {
                 _lobby.SwitchState(LobbyGui.LobbyGuiState.Default);
@@ -91,6 +93,8 @@ namespace Content.Client.Lobby
             _gameTicker.LobbyStatusUpdated -= LobbyStatusUpdated;
             _gameTicker.LobbyLateJoinStatusUpdated -= LobbyLateJoinStatusUpdated;
 
+            _lobby!.VoteContainer.Orphan();
+
             _lobby!.CharacterPreview.CharacterSetupButton.OnPressed -= OnSetupPressed;
             _lobby!.ReadyButton.OnPressed -= OnReadyPressed;
             _lobby!.ReadyButton.OnToggled -= OnReadyToggled;
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml
index 77c79e96d2..8dbef0632a 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml
@@ -15,26 +15,28 @@
             <!-- LHS Controls -->
             <BoxContainer Name="LeftSide" Orientation="Vertical" SeparationOverride="4" HorizontalExpand="True">
                 <Control Name="DefaultState" VerticalExpand="True">
-                    <!-- Left Top Panel -->
-                    <PanelContainer StyleClasses="AngleRect" HorizontalAlignment="Left" Name = "LeftSideTop" VerticalAlignment="Top" >
-                        <BoxContainer Orientation="Vertical" HorizontalAlignment="Center" MaxWidth="800">
-                            <info:LinkBanner Name="LinkBanner" VerticalExpand="false" HorizontalAlignment="Center" Margin="3 3 3 3"/>
-                            <controls:StripeBack>
-                                <BoxContainer Orientation="Horizontal" SeparationOverride="6" Margin="3 3 3 3">
-                                    <cc:UICommandButton Command="observe" Name="ObserveButton" Access="Public" Text="{Loc 'ui-lobby-observe-button'}" StyleClasses="ButtonBig"  WindowType="{x:Type lobbyUi:ObserveWarningWindow}"/>
-                                    <Label Name="StartTime"
-                                           Access="Public"
-                                           Align="Left"
-                                           FontColorOverride="{x:Static maths:Color.DarkGray}"
-                                           StyleClasses="LabelBig" HorizontalExpand="True" />
-                                    <Button Name="ReadyButton" Access="Public" ToggleMode="True" Text="{Loc 'ui-lobby-ready-up-button'}"
-                                            StyleClasses="ButtonBig" MinWidth="137"/>
-                                </BoxContainer>
-                            </controls:StripeBack>
-                        </BoxContainer>
-                    </PanelContainer>
-                    <!-- Voting Popups -->
-                    <BoxContainer Orientation="Vertical" SeparationOverride="4" Name="VoteContainer" Access="Public" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+                    <BoxContainer Name="TopLeft" Orientation="Vertical">
+                        <!-- Left Top Panel -->
+                        <PanelContainer StyleClasses="AngleRect" HorizontalAlignment="Left" Name = "LeftSideTop" VerticalAlignment="Top" >
+                            <BoxContainer Orientation="Vertical" HorizontalAlignment="Center" MaxWidth="800">
+                                <info:LinkBanner Name="LinkBanner" VerticalExpand="false" HorizontalAlignment="Center" Margin="3 3 3 3"/>
+                                <controls:StripeBack>
+                                    <BoxContainer Orientation="Horizontal" SeparationOverride="6" Margin="3 3 3 3">
+                                        <cc:UICommandButton Command="observe" Name="ObserveButton" Access="Public" Text="{Loc 'ui-lobby-observe-button'}" StyleClasses="ButtonBig"  WindowType="{x:Type lobbyUi:ObserveWarningWindow}"/>
+                                        <Label Name="StartTime"
+                                               Access="Public"
+                                               Align="Left"
+                                               FontColorOverride="{x:Static maths:Color.DarkGray}"
+                                               StyleClasses="LabelBig" HorizontalExpand="True" />
+                                        <Button Name="ReadyButton" Access="Public" ToggleMode="True" Text="{Loc 'ui-lobby-ready-up-button'}"
+                                                StyleClasses="ButtonBig" MinWidth="137"/>
+                                    </BoxContainer>
+                                </controls:StripeBack>
+                            </BoxContainer>
+                        </PanelContainer>
+                        <!-- Voting Popups -->
+                        <BoxContainer Orientation="Vertical" SeparationOverride="4" Name="VoteContainer" Access="Public" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0 8"/>
+                    </BoxContainer>
                     <!-- Vertical Padding-->
                     <Control VerticalExpand="True"/>
                     <!-- Left Bot Panel -->
diff --git a/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs b/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs
index 809134bbb2..52d0348b79 100644
--- a/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs
+++ b/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs
@@ -1,10 +1,12 @@
 using Content.Client.UserInterface.Screens;
 using Content.Client.UserInterface.Systems.Gameplay;
 using Content.Client.Voting;
+using JetBrains.Annotations;
 using Robust.Client.UserInterface.Controllers;
 
 namespace Content.Client.UserInterface.Systems.Vote;
 
+[UsedImplicitly]
 public sealed class VoteUIController : UIController
 {
     [Dependency] private readonly IVoteManager _votes = default!;
-- 
2.51.2