diff --git a/OpenRA.Game/Chrome.cs b/OpenRA.Game/Chrome.cs index f5b48d5ade..1ad6d8ad92 100644 --- a/OpenRA.Game/Chrome.cs +++ b/OpenRA.Game/Chrome.cs @@ -170,8 +170,8 @@ namespace OpenRA var h = 600; var r = new Rectangle( (Game.viewport.Width - w) / 2, (Game.viewport.Height - h) / 2, w, h ); - var typingBox = new Rectangle(r.Left + 20, r.Bottom - 47, r.Width - 40, 27); - var chatBox = new Rectangle(r.Left + 20, r.Bottom - 269, r.Width - 40, 220); + var typingBox = new Rectangle(r.Left + 20, r.Bottom - 77, r.Width - 40, 27); + var chatBox = new Rectangle(r.Left + 20, r.Bottom - 269, r.Width - 40, 190); DrawDialogBackground(typingBox, "dialog2"); DrawDialogBackground(chatBox, "dialog3"); diff --git a/OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs b/OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs index 6c17f8d585..634c5be1a8 100644 --- a/OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs +++ b/OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs @@ -44,9 +44,14 @@ namespace OpenRA.Widgets.Delegates r.OpenWindow("MAP_CHOOSER"); return true; }; - + mapButton.IsVisible = () => mapButton.Visible && Game.IsHost; + var disconnectButton = lobby.GetWidget("DISCONNECT_BUTTON"); + disconnectButton.OnMouseUp = mi => { + Game.Disconnect(); + return true; + }; Game.LobbyInfoChanged += UpdatePlayerList; } diff --git a/mods/ra/menus.yaml b/mods/ra/menus.yaml index 5a89c3fb89..9eb6321f47 100644 --- a/mods/ra/menus.yaml +++ b/mods/ra/menus.yaml @@ -474,6 +474,14 @@ Container: Width:120 Height:25 Text:Change Map + Button@DISCONNECT_BUTTON: + Id:DISCONNECT_BUTTON + Visible:true + X:PARENT_RIGHT-140 + Y:PARENT_BOTTOM-43 + Width:120 + Height:25 + Text:Disconnect Background@MAP_CHOOSER: Id:MAP_CHOOSER X:(WINDOW_RIGHT - WIDTH)/2