Use improved ItemLists (#335)

* Use improved ItemList

* Address reviews

* Update submodule
This commit is contained in:
Víctor Aguilera Puerto
2019-09-13 15:35:06 +02:00
committed by Pieter-Jan Briers
parent e570f10d69
commit 3f4c9a8326
6 changed files with 11 additions and 21 deletions

View File

@@ -54,7 +54,7 @@ namespace Content.Client.Research
_unlockedTechnologies = new ItemList()
{
SelectMode = ItemList.ItemListSelectMode.Single,
SelectMode = ItemList.ItemListSelectMode.Button,
SizeFlagsHorizontal = SizeFlags.FillExpand,
SizeFlagsVertical = SizeFlags.FillExpand,
};
@@ -63,7 +63,7 @@ namespace Content.Client.Research
_unlockableTechnologies = new ItemList()
{
SelectMode = ItemList.ItemListSelectMode.Single,
SelectMode = ItemList.ItemListSelectMode.Button,
SizeFlagsHorizontal = SizeFlags.FillExpand,
SizeFlagsVertical = SizeFlags.FillExpand,
};
@@ -72,7 +72,7 @@ namespace Content.Client.Research
_futureTechnologies = new ItemList()
{
SelectMode = ItemList.ItemListSelectMode.Single,
SelectMode = ItemList.ItemListSelectMode.Button,
SizeFlagsHorizontal = SizeFlags.FillExpand,
SizeFlagsVertical = SizeFlags.FillExpand,
};
@@ -192,8 +192,6 @@ namespace Content.Client.Research
{
TechnologySelected = _unlockedTechnologyPrototypes[obj.ItemIndex];
_unlockedTechnologies.Unselect(obj.ItemIndex);
UnlockButton.Disabled = true;
PopulateSelectedTechnology();
@@ -206,8 +204,6 @@ namespace Content.Client.Research
{
TechnologySelected = _unlockableTechnologyPrototypes[obj.ItemIndex];
_unlockableTechnologies.Unselect(obj.ItemIndex);
UnlockButton.Disabled = Owner.Points < TechnologySelected.RequiredPoints;
PopulateSelectedTechnology();
@@ -220,8 +216,6 @@ namespace Content.Client.Research
{
TechnologySelected = _futureTechnologyPrototypes[obj.ItemIndex];
_futureTechnologies.Unselect(obj.ItemIndex);
UnlockButton.Disabled = true;
PopulateSelectedTechnology();
@@ -257,7 +251,7 @@ namespace Content.Client.Research
}
else
{
_futureTechnologies.AddItem(tech.Name, tech.Icon.Frame0());;
_futureTechnologies.AddItem(tech.Name, tech.Icon.Frame0());
_futureTechnologyPrototypes.Add(tech);
}
}