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

Decouple color picker palette definitions to their own trait.

Browse Source
This commit is contained in:
Paul Chote
2021-05-09 15:23:33 +01:00
committed by teinarss
parent 57d955ec72
commit 3bc42543fa
17 changed files with 116 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{
readonly string[] allowedExtensions;
readonly IEnumerable<IReadOnlyPackage> acceptablePackages;
readonly string[] palettes;
readonly World world;
readonly ModData modData;
@@ -58,6 +58,15 @@ namespace OpenRA.Mods.Common.Widgets.Logic
this.modData = modData;
panel = widget;
var colorPickerPalettes = world.WorldActor.TraitsImplementing<IProvidesAssetBrowserColorPickerPalettes>()
.SelectMany(p => p.ColorPickerPaletteNames)
.ToArray();
palettes = world.WorldActor.TraitsImplementing<IProvidesAssetBrowserPalettes>()
.SelectMany(p => p.PaletteNames)
.Concat(colorPickerPalettes)
.ToArray();
var ticker = panel.GetOrNull<LogicTickerWidget>("ANIMATION_TICKER");
if (ticker != null)
{
@@ -112,12 +121,12 @@ namespace OpenRA.Mods.Common.Widgets.Logic
}
var colorManager = modData.DefaultRules.Actors[SystemActors.World].TraitInfo<ColorPickerManagerInfo>();
colorManager.Update(worldRenderer, Game.Settings.Player.Color);
colorManager.Color = Game.Settings.Player.Color;
var colorDropdown = panel.GetOrNull<DropDownButtonWidget>("COLOR");
if (colorDropdown != null)
{
colorDropdown.IsDisabled = () => currentPalette != colorManager.PaletteName;
colorDropdown.IsDisabled = () => !colorPickerPalettes.Contains(currentPalette);
colorDropdown.OnMouseDown = _ => ColorPickerLogic.ShowColorDropDown(colorDropdown, colorManager, worldRenderer);
panel.Get<ColorBlockWidget>("COLORBLOCK").GetColor = () => colorManager.Color;
}
@@ -489,8 +498,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
return item;
};
var palettes = world.WorldActor.TraitsImplementing<IProvidesAssetBrowserPalettes>()
.SelectMany(p => p.PaletteNames);
dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 280, palettes, setupItem);
return true;
}