integrate scrollbar and checkbox art. fixes #215.

OpenRA.Game/Widgets/CheckboxWidget.cs

@@ -10,6 +10,7 @@
 
 using System;
 using System.Drawing;
+using OpenRA.Graphics;
 
 namespace OpenRA.Widgets
 {
@@ -18,11 +19,11 @@ namespace OpenRA.Widgets
 		public string Text = "";
 		public int baseLine = 1;
 		public bool Bold = false;
-		public Func<bool> Checked = () => {return false;};
+		public Func<bool> Checked = () => false;
 		
 		public override void DrawInner(World world)
 		{
-			var font = (Bold) ? Game.Renderer.BoldFont : Game.Renderer.RegularFont;
+			var font = Bold ? Game.Renderer.BoldFont : Game.Renderer.RegularFont;
 			var pos = RenderOrigin;
 			var rect = RenderBounds;
 			var check = new Rectangle(rect.Location,
@@ -31,14 +32,13 @@ namespace OpenRA.Widgets
 
 			var textSize = font.Measure(Text);
 			font.DrawText(Text,
-				new float2(rect.Left + rect.Height * 1.5f, pos.Y - baseLine + (Bounds.Height - textSize.Y)/2), Color.White);
+				new float2(rect.Left + rect.Height * 1.5f, 
+					pos.Y - baseLine + (Bounds.Height - textSize.Y)/2), Color.White);
 
 			if (Checked())
-			{				
-				Game.Renderer.RgbaSpriteRenderer.Flush();
-				WidgetUtils.FillRectWithColor(check.InflateBy(-4,-5,-4,-5),Color.White);
-				Game.Renderer.LineRenderer.Flush();
-			}
+				WidgetUtils.DrawRGBA(
+					ChromeProvider.GetImage("checkbox", "checked"),
+					new float2(rect.Left + 2, rect.Top + 2));
 		}
 
 		public override bool HandleInputInner(MouseInput mi) { return true; }

OpenRA.Game/Widgets/ImageWidget.cs

@@ -23,8 +23,8 @@ namespace OpenRA.Widgets
 		public ImageWidget()
 			: base()
 		{
-			GetImageName = () => { return ImageName; };
-			GetImageCollection = () => { return ImageCollection; };
+			GetImageName = () => ImageName;
+			GetImageCollection = () => ImageCollection;
 		}
 
 		protected ImageWidget(ImageWidget other)

OpenRA.Game/Widgets/LabelWidget.cs

@@ -27,8 +27,8 @@ namespace OpenRA.Widgets
 		public LabelWidget()
 			: base()
 		{
-			GetText = () => { return Text; };
-			GetBackground = () => { return Background; };
+			GetText = () => Text;
+			GetBackground = () => Background;
 		}
 
 		protected LabelWidget(LabelWidget other)

OpenRA.Game/Widgets/ListBoxWidget.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using System.Drawing;
+using OpenRA.Graphics;
 
 namespace OpenRA.Widgets
 {
@@ -63,6 +64,15 @@ namespace OpenRA.Widgets
 			WidgetUtils.DrawPanel(downButtonBg, downButtonRect);
 			WidgetUtils.DrawPanel(scrollbarBg, scrollbarRect);
 
+			var upOffset = UpPressed ? 4 : 3;
+			var downOffset = DownPressed ? 4 : 3;
+			WidgetUtils.DrawRGBA(ChromeProvider.GetImage("scrollbar", "up_arrow"),
+				new float2(upButtonRect.Left + upOffset, upButtonRect.Top + upOffset));
+			WidgetUtils.DrawRGBA(ChromeProvider.GetImage("scrollbar", "down_arrow"),
+				new float2(downButtonRect.Left + downOffset, downButtonRect.Top + downOffset));
+
+			Game.Renderer.RgbaSpriteRenderer.Flush();
+
 			Game.Renderer.Device.EnableScissor(backgroundRect.X, backgroundRect.Y + HeaderHeight, backgroundRect.Width, backgroundRect.Height - HeaderHeight);
 
 			foreach (var child in Children)

OpenRA.Game/Widgets/ViewportScrollControllerWidget.cs

@@ -9,12 +9,6 @@
 #endregion
 
 using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using OpenRA.Orders;
-using OpenRA.Traits;
-using OpenRA.FileFormats;
 
 namespace OpenRA.Widgets
 {
@@ -35,7 +29,7 @@ namespace OpenRA.Widgets
 		ScrollDirection Keyboard;
 		ScrollDirection Edge;
 
-		public ViewportScrollControllerWidget() : base()	{}
+		public ViewportScrollControllerWidget() : base() { }
 		protected ViewportScrollControllerWidget(ViewportScrollControllerWidget widget) : base(widget) {}
 		public override void DrawInner( World world ) {}
 		

OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs

@@ -9,12 +9,11 @@
 #endregion
 
 using System;
-using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using OpenRA.FileFormats;
 using OpenRA.Orders;
 using OpenRA.Traits;
-using OpenRA.FileFormats;
 
 namespace OpenRA.Widgets
 {

mods/cnc/chrome.xml

@@ -13,11 +13,8 @@
 		<image name="bg" x="306" y="31" width="192" height="192" />
 		<image name="power-indicator" x="187" y="4" width="4" height="7" />
 	</collection>
-    	
 	<collection name="power-gdi" src="chrome-gdi.png">
-		
 		<image name="power-indicator" x="187" y="4" width="4" height="7" />
-	
 	</collection>
 	<collection name="palette-gdi" src="chrome-gdi.png">
 		<image name="top" x="297" y="288" width="201" height="9" />
@@ -59,11 +56,8 @@
 		<image name="bg" x="306" y="31" width="192" height="192" />
 		<image name="power-indicator" x="187" y="4" width="4" height="7" />
 	</collection>
-    
 	<collection name="power-nod" src="chrome-nod.png">
-		
 		<image name="power-indicator" x="187" y="4" width="4" height="7" />
-	
 	</collection>
 	<collection name="palette-nod" src="chrome-nod.png">
 		<image name="top" x="297" y="288" width="201" height="9" />
@@ -208,4 +202,11 @@
 		<image name="next" x="84" y="0" width="25" height="25" />
 		<image name="prev" x="112" y="0" width="25" height="25" />
 	</collection>
+	<collection name="scrollbar" src="buttons.png">
+		<image name="down_arrow" x="16" y="112" width="16" height="16" />
+		<image name="up_arrow" x="32" y="112" width="16" height="16" />
+	</collection>
+	<collection name="checkbox" src="buttons.png">
+		<image name="checked" x="0" y="112" width="16" height="16" />
+	</collection>
 </chrome>

mods/cnc/chrome/gamelobby.yaml

@@ -96,8 +96,9 @@ Container@ROOT:
 								Checkbox@STATUS:
 									Id:STATUS
 									X:455
-									Width:25
-									Height:25
+									Y:2
+									Width:20
+									Height:20
 						Container@TEMPLATE_REMOTE:
 							Id:TEMPLATE_REMOTE
 							X:0
@@ -151,8 +152,9 @@ Container@ROOT:
 								Checkbox@STATUS:
 									Id:STATUS
 									X:455
-									Width:25
-									Height:25
+									Y:2
+									Width:20
+									Height:20
 				Container@LABEL_CONTAINER:
 					X:30
 					Y:45

mods/ra/chrome.xml

@@ -201,4 +201,11 @@
 		<image name="next" x="84" y="0" width="25" height="25" />
 		<image name="prev" x="112" y="0" width="25" height="25" />
 	</collection>
+	<collection name="scrollbar" src="buttons.png">
+		<image name="down_arrow" x="16" y="112" width="16" height="16" />
+		<image name="up_arrow" x="32" y="112" width="16" height="16" />
+	</collection>
+	<collection name="checkbox" src="buttons.png">
+		<image name="checked" x="0" y="112" width="16" height="16" />
+	</collection>
 </chrome>

mods/ra/chrome/gamelobby.yaml

@@ -96,8 +96,9 @@ Container@ROOT:
 								Checkbox@STATUS:
 									Id:STATUS
 									X:455
-									Width:25
-									Height:25
+									Y:2
+									Width:20
+									Height:20
 						Container@TEMPLATE_REMOTE:
 							Id:TEMPLATE_REMOTE
 							X:0
@@ -151,8 +152,9 @@ Container@ROOT:
 								Checkbox@STATUS:
 									Id:STATUS
 									X:455
-									Width:25
-									Height:25
+									Y:2
+									Width:20
+									Height:20
 				Container@LABEL_CONTAINER:
 					X:30
 					Y:45