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

Crash on image/panel not found and add TryGet functions for searching

Browse Source
This commit is contained in:
Gustas
2022-10-11 13:52:06 +03:00
committed by abcdefg30
parent e743e6dd61
commit c041ea7d39
4 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,14 +33,7 @@ namespace OpenRA.Mods.Common.Widgets
public Func<string> GetTooltipText;
readonly CachedTransform<(string, string), Sprite> getImageCache = new CachedTransform<(string, string), Sprite>(
((string collection, string image) args) =>
{
var sprite = ChromeProvider.GetImage(args.collection, args.image);
if (sprite == null)
throw new ArgumentException($"Sprite {args.collection}/{args.image} was not found.");
return sprite;
});
((string collection, string image) args) => ChromeProvider.GetImage(args.collection, args.image));
public ImageWidget()
{

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

@@ -64,10 +64,7 @@ namespace OpenRA.Mods.Common.Widgets
if (!IgnoreChildMouseOver && !hover)
hover = Children.Contains(Ui.MouseOverWidget);
var panel = getPanelCache.Update((IsDisabled(), Depressed, hover, false, IsSelected() || IsHighlighted()));
if (panel != null)
WidgetUtils.DrawPanel(RenderBounds, panel);
WidgetUtils.DrawPanel(RenderBounds, getPanelCache.Update((IsDisabled(), Depressed, hover, false, IsSelected() || IsHighlighted())));
}
public override Widget Clone() { return new ScrollItemWidget(this); }

6
OpenRA.Mods.Common/Widgets/WidgetUtils.cs
View File

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.Common.Widgets
{
var collectionName = collection + (args.Highlighted ? "-highlighted" : "");
var variantImageName = GetStatefulImageName(imageName, args.Disabled, args.Pressed, args.Hover, args.Focused);
return ChromeProvider.GetImage(collectionName, variantImageName) ?? ChromeProvider.GetImage(collectionName, imageName);
return ChromeProvider.TryGetImage(collectionName, variantImageName) ?? ChromeProvider.GetImage(collectionName, imageName);
});
}
@@ -50,7 +50,7 @@ namespace OpenRA.Mods.Common.Widgets
{
var collectionName = collection + (args.Highlighted ? "-highlighted" : "");
var variantCollectionName = GetStatefulImageName(collectionName, args.Disabled, args.Pressed, args.Hover, args.Focused);
return ChromeProvider.GetPanelImages(variantCollectionName) ?? ChromeProvider.GetPanelImages(collectionName);
return ChromeProvider.TryGetPanelImages(variantCollectionName) ?? ChromeProvider.GetPanelImages(collectionName);
});
}
@@ -78,7 +78,7 @@ namespace OpenRA.Mods.Common.Widgets
public static void DrawPanel(string collection, Rectangle bounds)
{
var sprites = ChromeProvider.GetPanelImages(collection);
var sprites = ChromeProvider.TryGetPanelImages(collection);
if (sprites != null)
DrawPanel(bounds, sprites);
}