MainMenuCommon MainMenu now using Yoga Layout

OpenRA.Mods.Common/Widgets/ImageWidget.cs

@@ -32,6 +32,8 @@ public class ImageWidget : Widget
 		Lazy<TooltipContainerWidget> tooltipContainer;
 		public Func<string> GetTooltipText;
 
+		Sprite sprite;
+
 		public ImageWidget()
 		{
 			GetImageName = () => ImageName;
@@ -59,16 +61,28 @@ protected ImageWidget(ImageWidget other)
 
 		public override Widget Clone() { return new ImageWidget(this); }
 
-		public override void Draw()
+		public override void UpdateLayout()
 		{
 			var name = GetImageName();
 			var collection = GetImageCollection();
 
-			var sprite = ChromeProvider.GetImage(collection, name);
+			if (name == "")
+				return;
+
+			sprite = ChromeProvider.GetImage(collection, name);
 			if (sprite == null)
 				throw new ArgumentException("Sprite {0}/{1} was not found.".F(collection, name));
 
-			WidgetUtils.DrawRGBA(sprite, RenderOrigin);
+			if (Math.Abs(Node.Width.Value - sprite.Size.X) < 0.1 && Math.Abs(Node.Height.Value - sprite.Size.Y) < 0.1)
+				return;
+
+			Node.Width = sprite.Size.X;
+			Node.Height = sprite.Size.Y;
+		}
+
+		public override void Draw()
+		{
+			WidgetUtils.DrawRGBA(sprite, RenderOrigin, new float2(Node.LayoutWidth, Node.LayoutHeight));
 		}
 
 		public override bool HandleMouseInput(MouseInput mi)

OpenRA.Mods.Common/Widgets/WidgetUtils.cs

@@ -23,6 +23,11 @@ public static Sprite GetChromeImage(World world, string name)
 			return ChromeProvider.GetImage("chrome-" + world.LocalPlayer.Faction.InternalName, name);
 		}
 
+		public static void DrawRGBA(Sprite s, float2 pos, float2 size)
+		{
+			Game.Renderer.RgbaSpriteRenderer.DrawSprite(s, pos, size);
+		}
+
 		public static void DrawRGBA(Sprite s, float2 pos)
 		{
 			Game.Renderer.RgbaSpriteRenderer.DrawSprite(s, pos);