epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use covariant return types.

Browse Source 
Use the covariant return type feature of C# 9 to allow method overrides to be more specific about their return type. By exposing this information, e.g. for Widget.Clone(), callers will have more information. This allows various casts to be removed as the information is now available within the type system.
This commit is contained in:
RoosterDragon
2024-09-21 12:08:15 +01:00
committed by Gustas
parent 9c568aba33
commit aa121dcb2f
54 changed files with 60 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Graphics/TilesetSpecificSpriteSequence.cs
View File

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.Common.Graphics
public TilesetSpecificSpriteSequenceLoader(ModData modData)
: base(modData) { }
public override ISpriteSequence CreateSequence(
public override TilesetSpecificSpriteSequence CreateSequence(
ModData modData, string tileSet, SpriteCache cache, string image, string sequence, MiniYaml data, MiniYaml defaults)
{
return new TilesetSpecificSpriteSequence(cache, this, image, sequence, data, defaults);

2
OpenRA.Mods.Common/Terrain/DefaultTerrain.cs
View File

@@ -46,7 +46,7 @@ namespace OpenRA.Mods.Common.Terrain
public DefaultTerrainTemplateInfo(ITerrainInfo terrainInfo, MiniYaml my)
: base(terrainInfo, my) { }
protected override TerrainTileInfo LoadTileInfo(ITerrainInfo terrainInfo, MiniYaml my)
protected override DefaultTerrainTileInfo LoadTileInfo(ITerrainInfo terrainInfo, MiniYaml my)
{
var tile = new DefaultTerrainTileInfo();
FieldLoader.Load(tile, my);

2
OpenRA.Mods.Common/Widgets/ActorPreviewWidget.cs
View File

@@ -46,7 +46,7 @@ namespace OpenRA.Mods.Common.Widgets
viewportSizes = other.viewportSizes;
}
public override Widget Clone() { return new ActorPreviewWidget(this); }
public override ActorPreviewWidget Clone() { return new ActorPreviewWidget(this); }
public void SetPreview(ActorInfo actor, TypeDictionary td)
{

2
OpenRA.Mods.Common/Widgets/BackgroundWidget.cs
View File

@@ -37,6 +37,6 @@ namespace OpenRA.Mods.Common.Widgets
ClickThrough = other.ClickThrough;
}
public override Widget Clone() { return new BackgroundWidget(this); }
public override BackgroundWidget Clone() { return new BackgroundWidget(this); }
}
}

2
OpenRA.Mods.Common/Widgets/BadgeWidget.cs
View File

@@ -31,7 +31,7 @@ namespace OpenRA.Mods.Common.Widgets
playerDatabase = other.playerDatabase;
}
public override Widget Clone() { return new BadgeWidget(this); }
public override BadgeWidget Clone() { return new BadgeWidget(this); }
public override void Draw()
{

2
OpenRA.Mods.Common/Widgets/ButtonWidget.cs
View File

@@ -276,7 +276,7 @@ namespace OpenRA.Mods.Common.Widgets
}
}
public override Widget Clone() { return new ButtonWidget(this); }
public override ButtonWidget Clone() { return new ButtonWidget(this); }
public virtual int UsableWidth => Bounds.Width;
public virtual void DrawBackground(Rectangle rect, bool disabled, bool pressed, bool hover, bool highlighted)

2
OpenRA.Mods.Common/Widgets/CheckboxWidget.cs
View File

@@ -85,6 +85,6 @@ namespace OpenRA.Mods.Common.Widgets
rect.Top + (int)((rect.Height - checkmarkImage.Size.Y) / 2)));
}
public override Widget Clone() { return new CheckboxWidget(this); }
public override CheckboxWidget Clone() { return new CheckboxWidget(this); }
}
}

2
OpenRA.Mods.Common/Widgets/ClientTooltipRegionWidget.cs
View File

@@ -43,7 +43,7 @@ namespace OpenRA.Mods.Common.Widgets
client = other.client;
}
public override Widget Clone() { return new ClientTooltipRegionWidget(this); }
public override ClientTooltipRegionWidget Clone() { return new ClientTooltipRegionWidget(this); }
public void Bind(OrderManager orderManager, WorldRenderer worldRenderer, Session.Client client)
{

2
OpenRA.Mods.Common/Widgets/ColorBlockWidget.cs
View File

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.Common.Widgets
ClickSound = widget.ClickSound;
}
public override Widget Clone()
public override ColorBlockWidget Clone()
{
return new ColorBlockWidget(this);
}

2
OpenRA.Mods.Common/Widgets/ConfirmationDialogs.cs
View File

@@ -44,7 +44,7 @@ namespace OpenRA.Mods.Common.Widgets
var headerHeight = 0;
foreach (var l in headerLines)
{
var line = (LabelWidget)headerTemplate.Clone();
var line = headerTemplate.Clone();
line.GetText = () => l;
line.Bounds.Y += headerHeight;
prompt.AddChild(line);

4
OpenRA.Mods.Common/Widgets/DropDownButtonWidget.cs
View File

@@ -75,7 +75,7 @@ namespace OpenRA.Mods.Common.Widgets
rb.Top + (int)((rb.Height - separatorImage.Size.Y) / 2)));
}
public override Widget Clone() { return new DropDownButtonWidget(this); }
public override DropDownButtonWidget Clone() { return new DropDownButtonWidget(this); }
// This is crap
public override int UsableWidth => Bounds.Width - Bounds.Height; /* space for button */
@@ -228,6 +228,6 @@ namespace OpenRA.Mods.Common.Widgets
}
public override string GetCursor(int2 pos) { return null; }
public override Widget Clone() { return new MaskWidget(this); }
public override MaskWidget Clone() { return new MaskWidget(this); }
}
}

2
OpenRA.Mods.Common/Widgets/GradientColorBlockWidget.cs
View File

@@ -44,7 +44,7 @@ namespace OpenRA.Mods.Common.Widgets
GetBottomLeftColor = widget.GetBottomLeftColor;
}
public override Widget Clone()
public override GradientColorBlockWidget Clone()
{
return new GradientColorBlockWidget(this);
}

2
OpenRA.Mods.Common/Widgets/HotkeyEntryWidget.cs
View File

@@ -157,6 +157,6 @@ namespace OpenRA.Mods.Common.Widgets
Game.Renderer.DisableScissor();
}
public override Widget Clone() { return new HotkeyEntryWidget(this); }
public override HotkeyEntryWidget Clone() { return new HotkeyEntryWidget(this); }
}
}

2
OpenRA.Mods.Common/Widgets/ImageWidget.cs
View File

@@ -67,7 +67,7 @@ namespace OpenRA.Mods.Common.Widgets
GetSprite = () => getImageCache.Update((GetImageCollection(), GetImageName()));
}
public override Widget Clone() { return new ImageWidget(this); }
public override ImageWidget Clone() { return new ImageWidget(this); }
public override void Draw()
{

2
OpenRA.Mods.Common/Widgets/LabelForInputWidget.cs
View File

@@ -43,6 +43,6 @@ namespace OpenRA.Mods.Common.Widgets
font.DrawText(text, position, textColor.Update(inputWidget.Value.IsDisabled()));
}
public override Widget Clone() { return new LabelForInputWidget(this); }
public override LabelForInputWidget Clone() { return new LabelForInputWidget(this); }
}
}

2
OpenRA.Mods.Common/Widgets/LabelWidget.cs
View File

@@ -125,7 +125,7 @@ namespace OpenRA.Mods.Common.Widgets
font.DrawText(text, position, color);
}
public override Widget Clone() { return new LabelWidget(this); }
public override LabelWidget Clone() { return new LabelWidget(this); }
public override string GetCursor(int2 pos) { return null; }
}

2
OpenRA.Mods.Common/Widgets/LabelWithHighlightWidget.cs
View File

@@ -81,6 +81,6 @@ namespace OpenRA.Mods.Common.Widgets
}
}
public override Widget Clone() { return new LabelWithHighlightWidget(this); }
public override LabelWithHighlightWidget Clone() { return new LabelWithHighlightWidget(this); }
}
}

2
OpenRA.Mods.Common/Widgets/LabelWithTooltipWidget.cs
View File

@@ -42,7 +42,7 @@ namespace OpenRA.Mods.Common.Widgets
GetTooltipText = other.GetTooltipText;
}
public override Widget Clone() { return new LabelWithTooltipWidget(this); }
public override LabelWithTooltipWidget Clone() { return new LabelWithTooltipWidget(this); }
public override void MouseEntered()
{

2
OpenRA.Mods.Common/Widgets/LineGraphWidget.cs
View File

@@ -224,7 +224,7 @@ namespace OpenRA.Mods.Common.Widgets
cr.DrawLine(graphOrigin, graphOrigin + new float2(0, -height), 1, Color.White);
}
public override Widget Clone()
public override LineGraphWidget Clone()
{
return new LineGraphWidget(this);
}

2
OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
View File

@@ -744,7 +744,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var allAssetTypes = new[] { AssetType.Sprite, AssetType.Model, AssetType.Audio, AssetType.Video, AssetType.Unknown };
foreach (var type in allAssetTypes)
{
var assetType = (CheckboxWidget)assetTypeTemplate.Clone();
var assetType = assetTypeTemplate.Clone();
var text = type.ToString();
assetType.GetText = () => text;
assetType.IsChecked = () => assetTypesToDisplay.HasFlag(type);

2
OpenRA.Mods.Common/Widgets/Logic/ButtonTooltipLogic.cs
View File

@@ -53,7 +53,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
foreach (var line in desc.Split('\n', StringSplitOptions.None))
{
descWidth = Math.Max(descWidth, descFont.Measure(line).X);
var lineLabel = (LabelWidget)descTemplate.Clone();
var lineLabel = descTemplate.Clone();
lineLabel.GetText = () => line;
lineLabel.Bounds.Y = descOffset;
widget.AddChild(lineLabel);

4
OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs
View File

@@ -115,7 +115,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var color = presetColors[colorIndex];
var newSwatch = (ColorBlockWidget)presetColorTemplate.Clone();
var newSwatch = presetColorTemplate.Clone();
newSwatch.GetColor = () => color;
newSwatch.IsVisible = () => true;
newSwatch.Bounds.X = i * newSwatch.Bounds.Width;
@@ -136,7 +136,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{
var colorIndex = j * paletteCols + i;
var newSwatch = (ColorBlockWidget)customColorTemplate.Clone();
var newSwatch = customColorTemplate.Clone();
var getColor = new CachedTransform<Color, Color>(c => colorManager.MakeValid(c, world.LocalRandom, Array.Empty<Color>(), Array.Empty<Color>()));
newSwatch.GetColor = () => getColor.Update(Game.Settings.Player.CustomColors[colorIndex]);

2
OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs
View File

@@ -83,7 +83,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var font = Game.Renderer.Fonts[template.Font];
var lines = modCredits ? modLines : engineLines;
var label = (LabelWidget)template.Clone();
var label = template.Clone();
label.GetText = () => lines;
label.IncreaseHeightToFitCurrentText();
scrollPanel.AddChild(label);

2
OpenRA.Mods.Common/Widgets/Logic/Editor/CommonSelectorLogic.cs
View File

@@ -145,7 +145,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var categoryHeight = 5 + selectButtons.Bounds.Height;
foreach (var cat in FilteredCategories)
{
var category = (CheckboxWidget)categoryTemplate.Clone();
var category = categoryTemplate.Clone();
category.GetText = () => cat;
category.IsChecked = () => SelectedCategories.Contains(cat);
category.IsVisible = () => true;

2
OpenRA.Mods.Common/Widgets/Logic/Editor/MapOverlaysLogic.cs
View File

@@ -101,7 +101,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
MapOverlays[] allCategories = { MapOverlays.Grid, MapOverlays.Buildable, MapOverlays.Marker };
foreach (var cat in allCategories)
{
var category = (CheckboxWidget)categoryTemplate.Clone();
var category = categoryTemplate.Clone();
category.GetText = () => cat.ToString();
category.IsVisible = () => true;

2
OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs
View File

@@ -97,7 +97,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (visibilityOption == MapVisibility.Shellmap && !map.Visibility.HasFlag(visibilityOption))
continue;
var checkbox = (CheckboxWidget)visOptionTemplate.Clone();
var checkbox = visOptionTemplate.Clone();
checkbox.GetText = () => visibilityOption.ToString();
checkbox.IsChecked = () => map.Visibility.HasFlag(visibilityOption);
checkbox.OnClick = () => map.Visibility ^= visibilityOption;

2
OpenRA.Mods.Common/Widgets/Logic/GameSaveBrowserLogic.cs
View File

@@ -235,7 +235,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
// Create the item manually so the click handlers can refer to itself
// This simplifies the rename handling (only needs to update ItemKey)
var item = gameTemplate.Clone() as ScrollItemWidget;
var item = gameTemplate.Clone();
item.ItemKey = savePath;
item.IsVisible = () => true;
item.IsSelected = () => selectedSave == item.ItemKey;

2
OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameMenuLogic.cs
View File

@@ -295,7 +295,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
ButtonWidget AddButton(string id, string label)
{
var button = buttonTemplate.Clone() as ButtonWidget;
var button = buttonTemplate.Clone();
var lastButton = buttons.LastOrDefault();
if (lastButton != null)
{

4
OpenRA.Mods.Common/Widgets/Logic/Installation/InstallFromSourceLogic.cs
View File

@@ -338,7 +338,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
listPanel.RemoveChildren();
foreach (var package in availablePackages)
{
var containerWidget = (ContainerWidget)checkboxListTemplate.Clone();
var containerWidget = checkboxListTemplate.Clone();
var checkboxWidget = containerWidget.Get<CheckboxWidget>("PACKAGE_CHECKBOX");
var title = FluentProvider.GetMessage(package.Title);
checkboxWidget.GetText = () => title;
@@ -385,7 +385,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
foreach (var i in kv.Value)
{
var item = i;
var labelWidget = (LabelWidget)labelListTemplate.Clone();
var labelWidget = labelListTemplate.Clone();
labelWidget.GetText = () => item;
listPanel.AddChild(labelWidget);
}

2
OpenRA.Mods.Common/Widgets/Logic/Installation/ModContentSourceTooltipLogic.cs
View File

@@ -33,7 +33,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var bottomMargin = sources.Bounds.Height;
foreach (var source in sourceTitles)
{
var label = (LabelWidget)template.Clone();
var label = template.Clone();
var title = source;
label.GetText = () => title;
label.Bounds.Y = sources.Bounds.Height;

4
OpenRA.Mods.Common/Widgets/Logic/Settings/SettingsLogic.cs
View File

@@ -86,7 +86,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
foreach (var panel in panels)
{
var container = panelTemplate.Clone() as ContainerWidget;
var container = panelTemplate.Clone();
container.Id = panel.Key;
panelContainer.AddChild(container);
@@ -167,7 +167,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
ButtonWidget AddSettingsTab(string id, string label)
{
var tab = tabTemplate.Clone() as ButtonWidget;
var tab = tabTemplate.Clone();
var lastButton = buttons.LastOrDefault();
if (lastButton != null)
{

2
OpenRA.Mods.Common/Widgets/Logic/SimpleTooltipLogic.cs
View File

@@ -43,7 +43,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var bottom = 0;
for (var i = 0; i < lines.Length; i++)
{
var line = (LabelWidget)label.Clone();
var line = label.Clone();
var lineText = lines[i];
line.Bounds.Y += spacing.Bounds.Y + i * spacing.Bounds.Height;
line.Bounds.Width = textWidth;

2
OpenRA.Mods.Common/Widgets/Logic/SystemInfoPromptLogic.cs
View File

@@ -68,7 +68,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
foreach (var (name, value) in GetSystemInformation().Values)
{
var label = template.Clone() as LabelWidget;
var label = template.Clone();
var text = name + ": " + value;
label.GetText = () => text;
sysInfoData.AddChild(label);

2
OpenRA.Mods.Common/Widgets/MapPreviewWidget.cs
View File

@@ -116,7 +116,7 @@ namespace OpenRA.Mods.Common.Widgets
spawnLabelOffset = ChromeMetrics.Get<int2>("SpawnLabelOffset");
}
public override Widget Clone() { return new MapPreviewWidget(this); }
public override MapPreviewWidget Clone() { return new MapPreviewWidget(this); }
public override bool HandleMouseInput(MouseInput mi)
{

2
OpenRA.Mods.Common/Widgets/ObserverArmyIconsWidget.cs
View File

@@ -157,7 +157,7 @@ namespace OpenRA.Mods.Common.Widgets
Parent.Parent.Bounds.Width = Math.Max(25 + widestChildWidth, Bounds.Left + MinWidth);
}
public override Widget Clone()
public override ObserverArmyIconsWidget Clone()
{
return new ObserverArmyIconsWidget(this);
}

2
OpenRA.Mods.Common/Widgets/ObserverProductionIconsWidget.cs
View File

@@ -234,7 +234,7 @@ namespace OpenRA.Mods.Common.Widgets
return WidgetUtils.FormatTime(item.Queue.RemainingTimeActual(item), timestep);
}
public override Widget Clone()
public override ObserverProductionIconsWidget Clone()
{
return new ObserverProductionIconsWidget(this);
}

2
OpenRA.Mods.Common/Widgets/ObserverSupportPowerIconsWidget.cs
View File

@@ -153,7 +153,7 @@ namespace OpenRA.Mods.Common.Widgets
return WidgetUtils.FormatTime(item.RemainingTicks, timestep);
}
public override Widget Clone()
public override ObserverSupportPowerIconsWidget Clone()
{
return new ObserverSupportPowerIconsWidget(this);
}

4
OpenRA.Mods.Common/Widgets/PasswordFieldWidget.cs
View File

@@ -9,8 +9,6 @@
*/
#endregion
using OpenRA.Widgets;
namespace OpenRA.Mods.Common.Widgets
{
public class PasswordFieldWidget : TextFieldWidget
@@ -20,6 +18,6 @@ namespace OpenRA.Mods.Common.Widgets
: base(widget) { }
protected override string GetApparentText() { return new string('*', Text.Length); }
public override Widget Clone() { return new PasswordFieldWidget(this); }
public override PasswordFieldWidget Clone() { return new PasswordFieldWidget(this); }
}
}

2
OpenRA.Mods.Common/Widgets/ProgressBarWidget.cs
View File

@@ -80,6 +80,6 @@ namespace OpenRA.Mods.Common.Widgets
wasIndeterminate = indeterminate;
}
public override Widget Clone() { return new ProgressBarWidget(this); }
public override ProgressBarWidget Clone() { return new ProgressBarWidget(this); }
}
}

2
OpenRA.Mods.Common/Widgets/RGBASpriteWidget.cs
View File

@@ -27,7 +27,7 @@ namespace OpenRA.Mods.Common.Widgets
GetSprite = other.GetSprite;
}
public override Widget Clone() { return new RGBASpriteWidget(this); }
public override RGBASpriteWidget Clone() { return new RGBASpriteWidget(this); }
public override void Draw()
{

2
OpenRA.Mods.Common/Widgets/ResourcePreviewWidget.cs
View File

@@ -71,7 +71,7 @@ namespace OpenRA.Mods.Common.Widgets
IdealPreviewSize = other.IdealPreviewSize;
}
public override Widget Clone() { return new ResourcePreviewWidget(this); }
public override ResourcePreviewWidget Clone() { return new ResourcePreviewWidget(this); }
public override void Draw()
{

4
OpenRA.Mods.Common/Widgets/ScrollItemWidget.cs
View File

@@ -68,11 +68,11 @@ namespace OpenRA.Mods.Common.Widgets
WidgetUtils.DrawPanel(RenderBounds, getPanelCache.Update((IsDisabled(), Depressed, hover, false, IsSelected() || IsHighlighted())));
}
public override Widget Clone() { return new ScrollItemWidget(this); }
public override ScrollItemWidget Clone() { return new ScrollItemWidget(this); }
public static ScrollItemWidget Setup(ScrollItemWidget template, Func<bool> isSelected, Action onClick)
{
var w = template.Clone() as ScrollItemWidget;
var w = template.Clone();
w.IsVisible = () => true;
w.IsSelected = isSelected;
w.OnClick = onClick;

2
OpenRA.Mods.Common/Widgets/SliderWidget.cs
View File

@@ -95,7 +95,7 @@ namespace OpenRA.Mods.Common.Widgets
return (int)(0.5f * RenderBounds.Height + (RenderBounds.Width - RenderBounds.Height) * (x - MinimumValue) / (MaximumValue - MinimumValue));
}
public override Widget Clone() { return new SliderWidget(this); }
public override SliderWidget Clone() { return new SliderWidget(this); }
Rectangle ThumbRect
{

2
OpenRA.Mods.Common/Widgets/SpriteWidget.cs
View File

@@ -44,7 +44,7 @@ namespace OpenRA.Mods.Common.Widgets
WorldRenderer = other.WorldRenderer;
}
public override Widget Clone() { return new SpriteWidget(this); }
public override SpriteWidget Clone() { return new SpriteWidget(this); }
Sprite cachedSprite = null;
string cachedPalette = null;

2
OpenRA.Mods.Common/Widgets/TerrainTemplatePreviewWidget.cs
View File

@@ -51,7 +51,7 @@ namespace OpenRA.Mods.Common.Widgets
GetScale = other.GetScale;
}
public override Widget Clone() { return new TerrainTemplatePreviewWidget(this); }
public override TerrainTemplatePreviewWidget Clone() { return new TerrainTemplatePreviewWidget(this); }
public void SetTemplate(TerrainTemplateInfo template)
{

2
OpenRA.Mods.Common/Widgets/TextFieldWidget.cs
View File

@@ -600,6 +600,6 @@ namespace OpenRA.Mods.Common.Widgets
Game.Renderer.DisableScissor();
}
public override Widget Clone() { return new TextFieldWidget(this); }
public override TextFieldWidget Clone() { return new TextFieldWidget(this); }
}
}

2
OpenRA.Mods.Common/Widgets/WorldButtonWidget.cs
View File

@@ -39,6 +39,6 @@ namespace OpenRA.Mods.Common.Widgets
new WidgetArgs { { "button", this }, { "getText", GetTooltipText }, { "getDesc", GetTooltipDesc }, { "world", world } });
}
public override Widget Clone() { return new WorldButtonWidget(this); }
public override WorldButtonWidget Clone() { return new WorldButtonWidget(this); }
}
}

2
OpenRA.Mods.Common/Widgets/WorldLabelWithTooltipWidget.cs
View File

@@ -30,7 +30,7 @@ namespace OpenRA.Mods.Common.Widgets
world = other.world;
}
public override Widget Clone() { return new WorldLabelWithTooltipWidget(this); }
public override WorldLabelWithTooltipWidget Clone() { return new WorldLabelWithTooltipWidget(this); }
public override void MouseEntered()
{