space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-14 19:29:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds a back button to the lobby

Browse Source 
Allows the user to disconnect from the lobby and return to the main
menu. As far as I can tell, the user is properly disconnected from the
server.

Because two new textures were added, you'll have to re-run the resource
pack batch file to see them in the lobby.
This commit is contained in:
h3half
2017-05-17 19:50:14 -04:00
parent 1289fb74bc
commit 1e37cea4be
3 changed files with 47 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Resources/Textures/UserInterface/lobby_back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
Resources/Textures/UserInterface/lobby_back_green.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

59
SS14.Client.Services/State/States/LobbyMenu.cs
View File

@@ -39,6 +39,7 @@ namespace SS14.Client.Services.State.States
private readonly SimpleImage _imgMainBg;
private SimpleImage _imgChatBg;
private ImageButton _btnReady;
private ImageButton _btnBack;
private readonly List<Label> _serverLabels = new List<Label>();
@@ -165,6 +166,15 @@ namespace SS14.Client.Services.State.States
_btnReady.Clicked += _btnReady_Clicked;
_btnReady.Update(0);
_btnBack = new ImageButton()
{
ImageNormal = "lobby_back",
ImageHover = "lobby_back_green",
ZDepth = 1
};
_btnBack.Clicked += _btnBack_Clicked;
_btnBack.Update(0);
_lblServerInfo.FixedWidth = 100;
_lblModeInfo.FixedWidth = 90;
_lblPlayersInfo.FixedWidth = 60;
@@ -281,6 +291,7 @@ namespace SS14.Client.Services.State.States
UserInterfaceManager.AddComponent(_imgChatBg);
UserInterfaceManager.AddComponent(_lobbyChat);
UserInterfaceManager.AddComponent(_btnReady);
UserInterfaceManager.AddComponent(_btnBack);
foreach (Label curr in _serverLabels)
UserInterfaceManager.AddComponent(curr);
@@ -304,6 +315,7 @@ namespace SS14.Client.Services.State.States
UserInterfaceManager.RemoveComponent(_imgChatBg);
UserInterfaceManager.RemoveComponent(_lobbyChat);
UserInterfaceManager.RemoveComponent(_btnReady);
UserInterfaceManager.RemoveComponent(_btnBack);
foreach (Label curr in _serverLabels)
UserInterfaceManager.RemoveComponent(curr);
@@ -320,6 +332,8 @@ namespace SS14.Client.Services.State.States
UpdateGUIPosition();
}
//SEARCHMARK
// This might be a hacky solution, but the button loses focus way too fast.
_btnReady.Focus = true;
@@ -338,46 +352,60 @@ namespace SS14.Client.Services.State.States
_recStatus = new FloatRect(_imgMainBg.Position.X + 10, _imgMainBg.Position.Y + 63, 785, 21);
_imgStatus.Position = new Vector2i((int)_recStatus.Left, (int)_recStatus.Top);
_imgStatus.Position = new Vector2i((int)_recStatus.Left,
(int)_recStatus.Top);
_imgStatus.Update(0);
_lblServer.Position = new Vector2i((int)_recStatus.Left + 5, (int)_recStatus.Top + 2);
_lblServer.Position = new Vector2i((int)_recStatus.Left + 5,
(int)_recStatus.Top + 2);
_lblServer.Update(0);
_lblServerInfo.Position = new Vector2i(_lblServer.ClientArea.Right(), _lblServer.ClientArea.Top);
_lblServerInfo.Position = new Vector2i(_lblServer.ClientArea.Right(),
_lblServer.ClientArea.Top);
_lblServerInfo.Update(0);
_lblMode.Position = new Vector2i(_lblServerInfo.ClientArea.Right() + (int)_lastLblSpacing,
_lblServerInfo.ClientArea.Top);
_lblServerInfo.ClientArea.Top);
_lblMode.Update(0);
_lblModeInfo.Position = new Vector2i(_lblMode.ClientArea.Right(), _lblMode.ClientArea.Top);
_lblModeInfo.Position = new Vector2i(_lblMode.ClientArea.Right(),
_lblMode.ClientArea.Top);
_lblModeInfo.Update(0);
_lblPlayers.Position = new Vector2i(_lblModeInfo.ClientArea.Right() + (int)_lastLblSpacing,
_lblModeInfo.ClientArea.Top);
_lblModeInfo.ClientArea.Top);
_lblPlayers.Update(0);
_lblPlayersInfo.Position = new Vector2i(_lblPlayers.ClientArea.Right(), _lblPlayers.ClientArea.Top);
_lblPlayersInfo.Position = new Vector2i(_lblPlayers.ClientArea.Right(),
_lblPlayers.ClientArea.Top);
_lblPlayersInfo.Update(0);
_lblPort.Position = new Vector2i(_lblPlayersInfo.ClientArea.Right() + (int)_lastLblSpacing,
_lblPlayersInfo.ClientArea.Top);
_lblPlayersInfo.ClientArea.Top);
_lblPort.Update(0);
_lblPortInfo.Position = new Vector2i(_lblPort.ClientArea.Right(), _lblPort.ClientArea.Top);
_lblPortInfo.Position = new Vector2i(_lblPort.ClientArea.Right(),
_lblPort.ClientArea.Top);
_lblPortInfo.Update(0);
_tabs.Position = _imgMainBg.Position + new Vector2i(5, 90);
_tabs.Update(0);
_lobbyChat.Position = new Vector2i(_imgMainBg.ClientArea.Left + 12, _imgMainBg.ClientArea.Bottom() - _lobbyChat.ClientArea.Height - 12); //Wish the chat box wasnt such shit. Then i wouldnt have to do this here.
_lobbyChat.Position = new Vector2i(_imgMainBg.ClientArea.Left + 12,
_imgMainBg.ClientArea.Bottom() - _lobbyChat.ClientArea.Height - 12); //Wish the chat box wasnt such shit. Then i wouldnt have to do this here.
_lobbyChat.Update(0);
_imgChatBg.Position = new Vector2i(_lobbyChat.ClientArea.Left - 6, _lobbyChat.ClientArea.Top - 9);
_imgChatBg.Position = new Vector2i(_lobbyChat.ClientArea.Left - 6,
_lobbyChat.ClientArea.Top - 9);
_imgChatBg.Update(0);
_btnReady.Position = new Vector2i(_lobbyChat.ClientArea.Right() - _btnReady.ClientArea.Width - 5, _lobbyChat.ClientArea.Top - _btnReady.ClientArea.Height - 8);
_btnReady.Position = new Vector2i(_lobbyChat.ClientArea.Right() - _btnReady.ClientArea.Width - 5,
_lobbyChat.ClientArea.Top - _btnReady.ClientArea.Height - 8);
_btnReady.Update(0);
_btnBack.Position = new Vector2i(_lobbyChat.ClientArea.Left - _btnBack.ClientArea.Width - 20,
_lobbyChat.ClientArea.Bottom() - _btnBack.ClientArea.Height);
_btnBack.Update(0);
}
private void _btnReady_Clicked(ImageButton sender)
@@ -386,6 +414,13 @@ namespace SS14.Client.Services.State.States
playerManager.SendVerb("joingame", 0);
}
private void _btnBack_Clicked(ImageButton sender)
{
StateManager.RequestStateChange<MainScreen>();
NetworkManager.Disconnect();
}
#endregion Startup, Shutdown, Update
#region IState Members