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

Fix invalid CachedTransform uses of MapPreview.

Browse Source
This commit is contained in:
Paul Chote
2025-04-17 17:45:48 +01:00
committed by Gustas Kažukauskas
parent e8d710dee4
commit 56c615d890
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.Common/Widgets/Logic/Lobby/MapPreviewLogic.cs
View File

@@ -111,17 +111,16 @@ namespace OpenRA.Mods.Common.Widgets.Logic
Widget SetupAuthorAndMapType(Widget parent)
{
var typeLabel = parent.Get<LabelWidget>("MAP_TYPE");
var typeCache = new CachedTransform<MapPreview, string>(
m => m.Categories.FirstOrDefault() ?? "");
var typeCache = new CachedTransform<string[], string>(c => c.FirstOrDefault() ?? "");
typeLabel.GetText = () => typeCache.Update(getMap().Map);
typeLabel.GetText = () => typeCache.Update(getMap().Map.Categories);
var authorLabel = parent.Get<LabelWidget>("MAP_AUTHOR");
var font = Game.Renderer.Fonts[authorLabel.Font];
var truncateCache = new CachedTransform<MapPreview, string>(
m => WidgetUtils.TruncateText(authorCache.Update(m.Author), authorLabel.Bounds.Width, font));
var truncateCache = new CachedTransform<string, string>(author =>
WidgetUtils.TruncateText(authorCache.Update(author), authorLabel.Bounds.Width, font));
authorLabel.GetText = () => truncateCache.Update(getMap().Map);
authorLabel.GetText = () => truncateCache.Update(getMap().Map.Author);
return parent;
}

10
OpenRA.Mods.Common/Widgets/Logic/ServerListLogic.cs
View File

@@ -335,12 +335,12 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (mapTitle != null)
{
var font = Game.Renderer.Fonts[mapTitle.Font];
var title = new CachedTransform<MapPreview, string>(m =>
var title = new CachedTransform<string, string>(t =>
{
var truncated = WidgetUtils.TruncateText(m.Title, mapTitle.Bounds.Width, font);
var truncated = WidgetUtils.TruncateText(t, mapTitle.Bounds.Width, font);
if (m.Title != truncated)
mapTitle.GetTooltipText = () => m.Title;
if (t != truncated)
mapTitle.GetTooltipText = () => t;
else
mapTitle.GetTooltipText = null;
@@ -358,7 +358,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (currentMap.Class == MapClassification.Unknown)
return mapClassificationUnknown;
return title.Update(currentMap);
return title.Update(currentMap.Title);
};
}