From 4bb70f11e9490354549852f4ceb100989b71de42 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Sun, 28 Nov 2010 13:53:38 +1300
Subject: [PATCH] Tweak header positioning and scrollpanel scissoring (don't
 draw contents over the 1px border).

---
 OpenRA.Game/Widgets/ScrollPanelWidget.cs |  2 +-
 mods/ra/chrome/gamelobby.yaml            | 26 ++++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/OpenRA.Game/Widgets/ScrollPanelWidget.cs b/OpenRA.Game/Widgets/ScrollPanelWidget.cs
index bee73f467a..993ba920b4 100644
--- a/OpenRA.Game/Widgets/ScrollPanelWidget.cs
+++ b/OpenRA.Game/Widgets/ScrollPanelWidget.cs
@@ -71,7 +71,7 @@ namespace OpenRA.Widgets
 			WidgetUtils.DrawRGBA(ChromeProvider.GetImage("scrollbar", "down_arrow"),
 				new float2(downButtonRect.Left + downOffset, downButtonRect.Top + downOffset));
 
-			Game.Renderer.EnableScissor(backgroundRect.X, backgroundRect.Y + HeaderHeight, backgroundRect.Width, backgroundRect.Height - HeaderHeight);
+			Game.Renderer.EnableScissor(backgroundRect.X+1, backgroundRect.Y + HeaderHeight+1, backgroundRect.Width-2, backgroundRect.Height - HeaderHeight-2);
 
 			foreach (var child in Children)
 				child.Draw( wr );
diff --git a/mods/ra/chrome/gamelobby.yaml b/mods/ra/chrome/gamelobby.yaml
index 87703abe69..81c907ea1d 100644
--- a/mods/ra/chrome/gamelobby.yaml
+++ b/mods/ra/chrome/gamelobby.yaml
@@ -32,9 +32,9 @@ Background@SERVER_LOBBY:
 		ScrollPanel@PLAYERSX:
 			Id:PLAYERSX
 			X:20
-			Y:75
+			Y:67
 			Width:504
-			Height:227
+			Height:235
 			Children:
 				Container@PLAYERS:
 					Id:PLAYERS
@@ -229,11 +229,11 @@ Background@SERVER_LOBBY:
 									Y:0
 		Container@LABEL_CONTAINER:
 			X:25
-			Y:45
+			Y:40
 			Children:
 				Label@LABEL_LOBBY_NAME:
 					Id:LABEL_LOBBY_NAME
-					Width:139
+					Width:150
 					Height:25
 					X:0
 					Y:0
@@ -242,39 +242,39 @@ Background@SERVER_LOBBY:
 					Bold:True
 				Label@LABEL_LOBBY_COLOR:
 					Id:LABEL_LOBBY_COLOR
-					Width:65
+					Width:80
 					Height:25
-					X:159
+					X:160
 					Y:0
 					Text:Color
 					Align:Center
 					Bold:True
 				Label@LABEL_LOBBY_FACTION:
 					Id:LABEL_LOBBY_FACTION
-					Width:110
+					Width:130
 					Height:25
-					X:244
+					X:250
 					Y:0
 					Text:Faction
 					Align:Center
 					Bold:True
 				Label@LABEL_LOBBY_TEAM:
 					Id:LABEL_LOBBY_TEAM
-					Width:70
+					Width:48
 					Height:25
-					X:351
+					X:390
 					Y:0
 					Text:Team
 					Align:Center
 					Bold:True
 				Label@LABEL_LOBBY_STATUS:
 					Id:LABEL_LOBBY_STATUS
-					X:420
+					X:448
 					Y:0
-					Width:70
+					Width:20
 					Height:25
 					Text:Ready
-					Align:Center
+					Align:Left
 					Bold:True
 		Button@CHANGEMAP_BUTTON:
 			Id:CHANGEMAP_BUTTON