Add button label offset for production icons

Author: patrickwieth

OpenRA.Mods.Common/Graphics/DefaultSpriteSequence.cs

@@ -140,6 +140,8 @@ public ReservationInfo(string filename, List<int> loadFrames, int[] frames, Mini
 		protected static readonly SpriteSequenceField<ProductionButtonStyle> ButtonStyleField = new(nameof(ButtonStyle), ProductionButtonStyle.Ra2);
 		protected static readonly SpriteSequenceField<string> ButtonLabelField = new(nameof(ButtonLabel), null);
 		protected static readonly SpriteSequenceField<string> ButtonLabelFontField = new(nameof(ButtonLabelFont), null);
+		[Desc("Offset applied to the button label bar in pixels.")]
+		protected static readonly SpriteSequenceField<float2> ButtonLabelOffsetField = new(nameof(ButtonLabelOffset), float2.Zero);
 		protected int tick;
 
 		[Desc("The total number of facings for the sequence. " +
@@ -234,6 +236,7 @@ public ReservationInfo(string filename, List<int> loadFrames, int[] frames, Mini
 		protected ProductionButtonStyle buttonStyle;
 		protected string buttonLabel;
 		protected string buttonLabelFont;
+		protected float2 buttonLabelOffset;
 
 		protected int zOffset;
 		protected int shadowZOffset;
@@ -282,6 +285,7 @@ Rectangle ISpriteSequence.Bounds
 		public ProductionButtonStyle ButtonStyle => buttonStyle;
 		public string ButtonLabel => buttonLabel;
 		public string ButtonLabelFont => buttonLabelFont;
+		public float2 ButtonLabelOffset => buttonLabelOffset;
 
 
 		protected static T LoadField<T>(string key, T fallback, MiniYaml data, MiniYaml defaults = null)
@@ -404,6 +408,7 @@ public DefaultSpriteSequence(SpriteCache cache, ISpriteSequenceLoader loader, st
 			buttonStyle = LoadField(ButtonStyleField, data, defaults);
 			buttonLabel = LoadField(ButtonLabelField, data, defaults);
 			buttonLabelFont = LoadField(ButtonLabelFontField, data, defaults);
+			buttonLabelOffset = LoadField(ButtonLabelOffsetField, data, defaults);
 			interpolatedFacings = LoadField(InterpolatedFacings, data, defaults, out var interpolatedFacingsLocation);
 
 
@@ -661,5 +666,3 @@ protected virtual float GetScale()
 
 
 
-
-

OpenRA.Mods.Common/Widgets/ObserverProductionIconsWidget.cs

@@ -166,6 +166,7 @@ public override void Draw()
 					productionIcon.ButtonStyle = seq.ButtonStyle;
 					productionIcon.ButtonLabel = seq.ButtonLabel;
 					productionIcon.ButtonLabelFont = seq.ButtonLabelFont;
+					productionIcon.ButtonLabelOffset = seq.ButtonLabelOffset;
 				}
 
 				productionIcons.Add(productionIcon);

OpenRA.Mods.Common/Widgets/ProductionIconButtonizer.cs

@@ -92,6 +92,7 @@ public static void Draw(ProductionIcon icon, Rectangle rect, string fallbackText
 				return;
 
 			var style = ResolveStyle(icon.ButtonStyle);
+
 			var fontName = icon.ButtonLabelFont ?? fallbackFont;
 			var useOsFont = OsShpCameoFontRenderer.CanHandle(fontName);
 			var frameRect = useOsFont
@@ -103,7 +104,14 @@ public static void Draw(ProductionIcon icon, Rectangle rect, string fallbackText
 			if (string.IsNullOrEmpty(label))
 				return;
 
-			DrawLabel(rect, label, fontName, fallbackFont, style);
+			var labelRect = rect;
+			if (icon.ButtonLabelOffset != float2.Zero)
+				labelRect = new Rectangle(
+					rect.Left + (int)icon.ButtonLabelOffset.X,
+					rect.Top + (int)icon.ButtonLabelOffset.Y,
+					rect.Width,
+					rect.Height);
+			DrawLabel(labelRect, label, fontName, fallbackFont, style);
 		}
 
 		static ButtonVisualStyle ResolveStyle(ProductionButtonStyle style)

OpenRA.Mods.Common/Widgets/ProductionPaletteWidget.cs

@@ -39,6 +39,7 @@ public class ProductionIcon
 		public ProductionButtonStyle ButtonStyle;
 		public string ButtonLabel;
 		public string ButtonLabelFont;
+		public float2 ButtonLabelOffset;
 		public float2 Pos;
 		public List<ProductionItem> Queued;
 		public ProductionQueue ProductionQueue;
@@ -550,6 +551,7 @@ public void RefreshIcons()
 					pi.ButtonStyle = seq.ButtonStyle;
 					pi.ButtonLabel = seq.ButtonLabel;
 					pi.ButtonLabelFont = seq.ButtonLabelFont;
+					pi.ButtonLabelOffset = seq.ButtonLabelOffset;
 				}
 
 				if (!icons.ContainsKey(rect))
@@ -667,4 +669,3 @@ public override string GetCursor(int2 pos)
 
 
 
-