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

relax items type for DropDownButtonLogic.ShowDropDown

Browse Source
This commit is contained in:
Chris Forbes
2011-10-30 09:55:32 +13:00
parent eaa4d06052
commit 7a6f4d3b04
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Widgets/DropDownButtonWidget.cs
View File

@@ -79,7 +79,7 @@ namespace OpenRA.Widgets
Widget.RootWidget.AddChild(panel);
}
public void ShowDropDown<T>(string panelTemplate, int height, List<T> options, Func<T, ScrollItemWidget, ScrollItemWidget> setupItem)
public void ShowDropDown<T>(string panelTemplate, int height, IEnumerable<T> options, Func<T, ScrollItemWidget, ScrollItemWidget> setupItem)
{
var substitutions = new Dictionary<string,int>() {{ "DROPDOWN_WIDTH", Bounds.Width }};
var panel = (ScrollPanelWidget)Widget.LoadWidget(panelTemplate, null, new WidgetArgs()

2
OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs
View File

@@ -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;
}
}

6
OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs
View File

@@ -122,7 +122,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
void ShowDropDown(Player p, DropDownButtonWidget dropdown)
{
var stances = Enum.GetValues(typeof(Stance)).OfType<Stance>().ToList();
var stances = Enum.GetValues(typeof(Stance)).OfType<Stance>();
Func<Stance, ScrollItemWidget, ScrollItemWidget> setupItem = (s, template) =>
{
var item = ScrollItemWidget.Setup(template,
@@ -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();
}

2
OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs
View File

@@ -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<int2, Color> GetSpawnColors(OrderManager orderManager, Map map)

2
OpenRA.Mods.RA/Widgets/Logic/MainMenuButtonsLogic.cs
View File

@@ -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);
}
}
}

2
OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs
View File

@@ -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;
}
}