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

Misc fixes in AssetBrowserLogic and MapOverlaysLogic

Browse Source
This commit is contained in:
penev92
2022-06-18 21:29:22 +03:00
committed by abcdefg30
parent df836620dc
commit 378c447ded
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -552,7 +552,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
bool ShowSourceDropdown(DropDownButtonWidget dropdown) bool ShowSourceDropdown(DropDownButtonWidget dropdown)
{ {
var sourceName = new CachedTransform<IReadOnlyPackage, string>(GetSourceDisplayName); var sourceName = new CachedTransform<IReadOnlyPackage, string>(GetSourceDisplayName);
Func<IReadOnlyPackage, ScrollItemWidget, ScrollItemWidget> setupItem = (source, itemTemplate) => ScrollItemWidget SetupItem(IReadOnlyPackage source, ScrollItemWidget itemTemplate)
{ {
var item = ScrollItemWidget.Setup(itemTemplate, var item = ScrollItemWidget.Setup(itemTemplate,
() => assetSource == source, () => assetSource == source,
@@ -560,10 +560,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
item.Get<LabelWidget>("LABEL").GetText = () => sourceName.Update(source); item.Get<LabelWidget>("LABEL").GetText = () => sourceName.Update(source);
return item; return item;
}; }
var sources = new[] { (IReadOnlyPackage)null }.Concat(acceptablePackages); 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; return true;
} }
@@ -602,17 +602,17 @@ namespace OpenRA.Mods.Common.Widgets.Logic
bool ShowPaletteDropdown(DropDownButtonWidget dropdown) bool ShowPaletteDropdown(DropDownButtonWidget dropdown)
{ {
Func<string, ScrollItemWidget, ScrollItemWidget> setupItem = (name, itemTemplate) => ScrollItemWidget SetupItem(string name, ScrollItemWidget itemTemplate)
{ {
var item = ScrollItemWidget.Setup(itemTemplate, var item = ScrollItemWidget.Setup(itemTemplate,
() => currentPalette == name, () => currentPalette == name,
() => currentPalette = name); () => currentPalette = name);
item.Get<LabelWidget>("LABEL").GetText = () => name; item.Get<LabelWidget>("LABEL").GetText = () => name;
return item; return item;
}; }
dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 280, palettes, setupItem); dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 280, palettes, SetupItem);
return true; return true;
} }

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

@@ -9,6 +9,7 @@
*/ */
#endregion #endregion
using System;
using System.Collections.Generic; using System.Collections.Generic;
using OpenRA.Mods.Common.Lint; using OpenRA.Mods.Common.Lint;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
@@ -19,6 +20,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
[ChromeLogicArgsHotkeys("ToggleGridOverlayKey", "ToggleBuildableOverlayKey")] [ChromeLogicArgsHotkeys("ToggleGridOverlayKey", "ToggleBuildableOverlayKey")]
public class MapOverlaysLogic : ChromeLogic public class MapOverlaysLogic : ChromeLogic
{ {
[Flags]
enum MapOverlays enum MapOverlays
{ {
None = 0, None = 0,