diff --git a/OpenRA.Game/Widgets/DropDownButtonWidget.cs b/OpenRA.Game/Widgets/DropDownButtonWidget.cs index 2cf3cff1a8..19509c7928 100644 --- a/OpenRA.Game/Widgets/DropDownButtonWidget.cs +++ b/OpenRA.Game/Widgets/DropDownButtonWidget.cs @@ -79,7 +79,7 @@ namespace OpenRA.Widgets Widget.RootWidget.AddChild(panel); } - public void ShowDropDown(string panelTemplate, int height, List options, Func setupItem) + public void ShowDropDown(string panelTemplate, int height, IEnumerable options, Func setupItem) { var substitutions = new Dictionary() {{ "DROPDOWN_WIDTH", Bounds.Width }}; var panel = (ScrollPanelWidget)Widget.LoadWidget(panelTemplate, null, new WidgetArgs() diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs index e998a5a6ea..c9b3e15124 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs @@ -179,7 +179,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic return item; }; - dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 500, options.Keys.ToList(), setupItem); + dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 500, options.Keys, setupItem); return true; } } diff --git a/OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs index 2f832e9f3d..04fed6c279 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs @@ -122,12 +122,12 @@ namespace OpenRA.Mods.RA.Widgets.Logic void ShowDropDown(Player p, DropDownButtonWidget dropdown) { - var stances = Enum.GetValues(typeof(Stance)).OfType().ToList(); + var stances = Enum.GetValues(typeof(Stance)).OfType(); Func setupItem = (s, template) => { var item = ScrollItemWidget.Setup(template, - () => s == world.LocalPlayer.Stances[ p ], - () => SetStance(dropdown, p, s)); + () => s == world.LocalPlayer.Stances[ p ], + () => SetStance(dropdown, p, s)); item.GetWidget("LABEL").GetText = () => s.ToString(); return item; @@ -141,8 +141,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic if (p.World.LobbyInfo.GlobalSettings.LockTeams) return; // team changes are banned - world.IssueOrder(new Order("SetStance", world.LocalPlayer.PlayerActor, - false) { TargetLocation = new int2((int)ss, 0), TargetString = p.InternalName }); + world.IssueOrder(new Order("SetStance", world.LocalPlayer.PlayerActor, false) + { TargetLocation = new int2((int)ss, 0), TargetString = p.InternalName }); bw.Text = ss.ToString(); } diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs index 2a2f184e89..ef896dd31f 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs @@ -117,7 +117,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic return item; }; - dropdown.ShowDropDown("RACE_DROPDOWN_TEMPLATE", 150, countryNames.Keys.ToList(), setupItem); + dropdown.ShowDropDown("RACE_DROPDOWN_TEMPLATE", 150, countryNames.Keys, setupItem); } public static Dictionary GetSpawnColors(OrderManager orderManager, Map map) diff --git a/OpenRA.Mods.RA/Widgets/Logic/MainMenuButtonsLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/MainMenuButtonsLogic.cs index 2480831dec..7c031c94e7 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/MainMenuButtonsLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/MainMenuButtonsLogic.cs @@ -59,7 +59,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic return item; }; - dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 150, Mod.AllMods.Keys.ToList(), setupItem); + dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 150, Mod.AllMods.Keys, setupItem); } } } diff --git a/OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs index 802058e534..04d9e2264f 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs @@ -156,7 +156,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic return item; }; - dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 500, options.Keys.ToList(), setupItem); + dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 500, options.Keys, setupItem); return true; } }