From 378c447ded39f5884ecf06d38fbf7532d942ab7c Mon Sep 17 00:00:00 2001 From: penev92 Date: Sat, 18 Jun 2022 21:29:22 +0300 Subject: [PATCH] Misc fixes in AssetBrowserLogic and MapOverlaysLogic --- .../Widgets/Logic/AssetBrowserLogic.cs | 14 +++++++------- .../Widgets/Logic/Editor/MapOverlaysLogic.cs | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs index 02c0488ed7..1ecff57b50 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs @@ -552,7 +552,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic bool ShowSourceDropdown(DropDownButtonWidget dropdown) { var sourceName = new CachedTransform(GetSourceDisplayName); - Func setupItem = (source, itemTemplate) => + ScrollItemWidget SetupItem(IReadOnlyPackage source, ScrollItemWidget itemTemplate) { var item = ScrollItemWidget.Setup(itemTemplate, () => assetSource == source, @@ -560,10 +560,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic item.Get("LABEL").GetText = () => sourceName.Update(source); return item; - }; + } var sources = new[] { (IReadOnlyPackage)null }.Concat(acceptablePackages); - dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 280, sources, setupItem); + dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 280, sources, SetupItem); return true; } @@ -602,17 +602,17 @@ namespace OpenRA.Mods.Common.Widgets.Logic bool ShowPaletteDropdown(DropDownButtonWidget dropdown) { - Func setupItem = (name, itemTemplate) => + ScrollItemWidget SetupItem(string name, ScrollItemWidget itemTemplate) { var item = ScrollItemWidget.Setup(itemTemplate, () => currentPalette == name, () => currentPalette = name); + item.Get("LABEL").GetText = () => name; - return item; - }; + } - dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 280, palettes, setupItem); + dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 280, palettes, SetupItem); return true; } diff --git a/OpenRA.Mods.Common/Widgets/Logic/Editor/MapOverlaysLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Editor/MapOverlaysLogic.cs index e45f344364..e97b5aaad5 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Editor/MapOverlaysLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Editor/MapOverlaysLogic.cs @@ -9,6 +9,7 @@ */ #endregion +using System; using System.Collections.Generic; using OpenRA.Mods.Common.Lint; using OpenRA.Mods.Common.Traits; @@ -19,6 +20,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic [ChromeLogicArgsHotkeys("ToggleGridOverlayKey", "ToggleBuildableOverlayKey")] public class MapOverlaysLogic : ChromeLogic { + [Flags] enum MapOverlays { None = 0,