From 3f4c9a8326839ec5332e2adb1cc6e0de40a12aab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Aguilera=20Puerto?= <6766154+Zumorica@users.noreply.github.com> Date: Fri, 13 Sep 2019 15:35:06 +0200 Subject: [PATCH] Use improved ItemLists (#335) * Use improved ItemList * Address reviews * Update submodule --- .../Research/ResearchClientServerSelectionMenu.cs | 4 ++-- Content.Client/GameTicking/ClientGameTicker.cs | 1 + Content.Client/Research/LatheMenu.cs | 9 ++------- Content.Client/Research/LatheQueueMenu.cs | 2 +- Content.Client/Research/ResearchConsoleMenu.cs | 14 ++++---------- RobustToolbox | 2 +- 6 files changed, 11 insertions(+), 21 deletions(-) diff --git a/Content.Client/GameObjects/Components/Research/ResearchClientServerSelectionMenu.cs b/Content.Client/GameObjects/Components/Research/ResearchClientServerSelectionMenu.cs index e32ccfa625..b0a08f8e7d 100644 --- a/Content.Client/GameObjects/Components/Research/ResearchClientServerSelectionMenu.cs +++ b/Content.Client/GameObjects/Components/Research/ResearchClientServerSelectionMenu.cs @@ -75,8 +75,8 @@ namespace Content.Client.GameObjects.Components.Research { var id = _serverIds[i]; _servers.AddItem($"ID: {id} || {_serverNames[i]}"); - if(id == _selectedServerId) - _servers.Select(i); + if (id == _selectedServerId) + _servers[id].Selected = true; } _servers.OnItemSelected += OnItemSelected; diff --git a/Content.Client/GameTicking/ClientGameTicker.cs b/Content.Client/GameTicking/ClientGameTicker.cs index a112b66431..22d9b486fd 100644 --- a/Content.Client/GameTicking/ClientGameTicker.cs +++ b/Content.Client/GameTicking/ClientGameTicker.cs @@ -14,6 +14,7 @@ using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.Interfaces.UserInterface; using Robust.Client.Player; using Robust.Client.UserInterface; +using Robust.Client.UserInterface.Controls; using Robust.Shared.Input; using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; diff --git a/Content.Client/Research/LatheMenu.cs b/Content.Client/Research/LatheMenu.cs index fec807a8f2..1cd4eba94e 100644 --- a/Content.Client/Research/LatheMenu.cs +++ b/Content.Client/Research/LatheMenu.cs @@ -131,6 +131,7 @@ namespace Content.Client.Research { SizeFlagsStretchRatio = 8, SizeFlagsVertical = SizeFlags.FillExpand, + SelectMode = ItemList.ItemListSelectMode.Button, }; Items.OnItemSelected += ItemSelected; @@ -178,12 +179,6 @@ namespace Content.Client.Research int.TryParse(AmountLineEdit.Text, out var quantity); if (quantity <= 0) quantity = 1; Owner.Queue(_shownRecipes[args.ItemIndex], quantity); - Items.SelectMode = ItemList.ItemListSelectMode.None; - Timer.Spawn(100, () => - { - Items.Unselect(args.ItemIndex); - Items.SelectMode = ItemList.ItemListSelectMode.Single; - }); } public void PopulateMaterials() @@ -208,7 +203,7 @@ namespace Content.Client.Research for (var i = 0; i < _shownRecipes.Count; i++) { var prototype = _shownRecipes[i]; - Items.SetItemDisabled(i, !Owner.Lathe.CanProduce(prototype, quantity)); + Items[i].Disabled = !Owner.Lathe.CanProduce(prototype, quantity); } } diff --git a/Content.Client/Research/LatheQueueMenu.cs b/Content.Client/Research/LatheQueueMenu.cs index 6281a6311a..f589c47b97 100644 --- a/Content.Client/Research/LatheQueueMenu.cs +++ b/Content.Client/Research/LatheQueueMenu.cs @@ -128,7 +128,7 @@ namespace Content.Client.Research var idx = 1; foreach (var recipe in Owner.QueuedRecipes) { - QueueList.AddItem($"{idx}. {recipe.Name}", recipe.Icon.Frame0(), false); + QueueList.AddItem($"{idx}. {recipe.Name}", recipe.Icon.Frame0()); idx++; } } diff --git a/Content.Client/Research/ResearchConsoleMenu.cs b/Content.Client/Research/ResearchConsoleMenu.cs index aed3b4e3af..aa74b64f0b 100644 --- a/Content.Client/Research/ResearchConsoleMenu.cs +++ b/Content.Client/Research/ResearchConsoleMenu.cs @@ -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); } } diff --git a/RobustToolbox b/RobustToolbox index e2c60871e9..7fc99ee528 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit e2c60871e96f58288fcb72f03694632fb45aed70 +Subproject commit 7fc99ee52803171fc12ce83117d32cbc35849ae1