tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change ListContainer to send null when selected is removed from the data (#20595)

Browse Source
This commit is contained in:
ShadowCommander
2023-10-24 19:07:47 -07:00
committed by GitHub
parent 3007200832
commit 4b10cab617
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
View File

@@ -22,7 +22,7 @@ namespace Content.Client.Administration.UI.CustomControls
private List<PlayerInfo> _playerList = new(); private List<PlayerInfo> _playerList = new();
private readonly List<PlayerInfo> _sortedPlayerList = new(); private readonly List<PlayerInfo> _sortedPlayerList = new();
public event Action<PlayerInfo?>? OnSelectionChanged; public event Action<PlayerInfo>? OnSelectionChanged;
public IReadOnlyList<PlayerInfo> PlayerInfo => _playerList; public IReadOnlyList<PlayerInfo> PlayerInfo => _playerList;
public Func<PlayerInfo, string, string>? OverrideText; public Func<PlayerInfo, string, string>? OverrideText;
@@ -46,9 +46,9 @@ namespace Content.Client.Administration.UI.CustomControls
BackgroundPanel.PanelOverride = new StyleBoxFlat {BackgroundColor = new Color(32, 32, 40)}; BackgroundPanel.PanelOverride = new StyleBoxFlat {BackgroundColor = new Color(32, 32, 40)};
} }
private void PlayerListItemPressed(BaseButton.ButtonEventArgs args, ListData data) private void PlayerListItemPressed(BaseButton.ButtonEventArgs? args, ListData? data)
{ {
if (data is not PlayerListData {Info: var selectedPlayer}) if (args == null || data is not PlayerListData {Info: var selectedPlayer})
return; return;
if (args.Event.Function == EngineKeyFunctions.UIClick) if (args.Event.Function == EngineKeyFunctions.UIClick)
{ {

4
Content.Client/Storage/StorageBoundUserInterface.cs
View File

@@ -61,9 +61,9 @@ namespace Content.Client.Storage
_window?.BuildEntityList(uid, component); _window?.BuildEntityList(uid, component);
} }
public void InteractWithItem(BaseButton.ButtonEventArgs args, ListData cData) public void InteractWithItem(BaseButton.ButtonEventArgs? args, ListData? cData)
{ {
if (cData is not EntityListData { Uid: var entity }) if (args == null || cData is not EntityListData { Uid: var entity })
return; return;
if (args.Event.Function == EngineKeyFunctions.UIClick) if (args.Event.Function == EngineKeyFunctions.UIClick)

8
Content.Client/UserInterface/Controls/ListContainer.cs
View File

@@ -22,7 +22,7 @@ public sealed class ListContainer : Control
} }
public bool Toggle { get; set; } public bool Toggle { get; set; }
public Action<ListData, ListContainerButton>? GenerateItem; public Action<ListData, ListContainerButton>? GenerateItem;
public Action<BaseButton.ButtonEventArgs, ListData>? ItemPressed; public Action<BaseButton.ButtonEventArgs?, ListData?>? ItemPressed;
public IReadOnlyList<ListData> Data => _data; public IReadOnlyList<ListData> Data => _data;
private const int DefaultSeparation = 3; private const int DefaultSeparation = 3;
@@ -92,6 +92,12 @@ public sealed class ListContainer : Control
_data = data.ToList(); _data = data.ToList();
_updateChildren = true; _updateChildren = true;
InvalidateArrange(); InvalidateArrange();
if (_selected != null && !data.Contains(_selected))
{
_selected = null;
ItemPressed?.Invoke(null, null);
}
} }
public void DirtyList() public void DirtyList()