From eed59a49f97bfc1bba26385a3393bdaaf280a263 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Mon, 19 Apr 2010 21:00:16 +1200
Subject: [PATCH] fix paul's hacky direct connect button

---
 .../Widgets/Delegates/ServerBrowserDelegate.cs        | 11 +++++++++--
 mods/ra/menus.yaml                                    |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs b/OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs
index 5b6d1f23f6..c7613acd0f 100644
--- a/OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs
+++ b/OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs
@@ -55,8 +55,8 @@ namespace OpenRA.Widgets.Delegates
 
 					r.GetWidget("JOINSERVER_PROGRESS_TITLE").Visible = false;
 
+					var margin = 20;
 					int height = 50;
-					int width = 300;
 					int i = 0;
 
 					foreach (var game in games)
@@ -64,7 +64,7 @@ namespace OpenRA.Widgets.Delegates
 						var g = game;
 						var b = new ButtonWidget
 						{
-							Bounds = new Rectangle(bg.Bounds.X + 20, bg.Bounds.Y + height, width, 25),
+							Bounds = new Rectangle(bg.Bounds.X + margin, bg.Bounds.Y + height, bg.Bounds.Width - 2 * margin, 25),
 							Id = "JOIN_GAME_{0}".F(i),
 							Text = "{0} ({1})".F(game.Name, game.Address),
 							Delegate = "ServerBrowserDelegate",
@@ -120,6 +120,13 @@ namespace OpenRA.Widgets.Delegates
 				r.CloseWindow();
 				return true;
 			};
+
+			r.GetWidget("JOINSERVER_BUTTON_DIRECTCONNECT").OnMouseUp = mi =>
+			{			/* rude hack. kill this as soon as we can do a direct connect via the commandline */
+				r.CloseWindow();
+				Game.JoinServer(Game.Settings.NetworkHost, Game.Settings.NetworkPort);
+				return true;
+			};
 		}
 	}
 }
diff --git a/mods/ra/menus.yaml b/mods/ra/menus.yaml
index 1ab5bb8872..5a7a522828 100644
--- a/mods/ra/menus.yaml
+++ b/mods/ra/menus.yaml
@@ -168,8 +168,8 @@ Container:
 					Height:25
 					Text:Fetching games...
 					Align:Center
-				Button@JOINSERVER_BUTTON_DIRECT_CONNECT:
-					Id:JOINSERVER_BUTTON_DIRECT_CONNECT
+				Button@JOINSERVER_BUTTON_DIRECTCONNECT:
+					Id:JOINSERVER_BUTTON_DIRECTCONNECT
 					X:PARENT_RIGHT - 140 - 130 - 130
 					Y:PARENT_BOTTOM - 45
 					Width:120