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

Make escape key work as expected with multiple open inventories (#35040)

Browse Source
This commit is contained in:
pathetic meowmeow
2025-02-25 11:40:39 -05:00
committed by GitHub
parent 92006deede
commit ab9c78b066
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/UserInterface/Systems/CloseWindow/CloseRecentWindowUIController.cs
View File

@@ -74,7 +74,7 @@ public sealed class CloseRecentWindowUIController : UIController
/// internal recentlyInteractedWindows tracking. /// internal recentlyInteractedWindows tracking.
/// </summary> /// </summary>
/// <param name="window"></param> /// <param name="window"></param>
private void SetMostRecentlyInteractedWindow(BaseWindow window) public void SetMostRecentlyInteractedWindow(BaseWindow window)
{ {
// Search through the list and see if already added. // Search through the list and see if already added.
// (This search is backwards since it's fairly common that the user is clicking the same // (This search is backwards since it's fairly common that the user is clicking the same
@@ -134,7 +134,6 @@ public sealed class CloseRecentWindowUIController : UIController
if (window.IsOpen) if (window.IsOpen)
return true; return true;
recentlyInteractedWindows.RemoveAt(i);
// continue going down the list, hoping to find a still-open window // continue going down the list, hoping to find a still-open window
} }

3
Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
View File

@@ -5,6 +5,7 @@ using Content.Client.Interaction;
using Content.Client.Storage; using Content.Client.Storage;
using Content.Client.Storage.Systems; using Content.Client.Storage.Systems;
using Content.Client.UserInterface.Systems.Hotbar.Widgets; using Content.Client.UserInterface.Systems.Hotbar.Widgets;
using Content.Client.UserInterface.Systems.Info;
using Content.Client.UserInterface.Systems.Storage.Controls; using Content.Client.UserInterface.Systems.Storage.Controls;
using Content.Client.Verbs.UI; using Content.Client.Verbs.UI;
using Content.Shared.CCVar; using Content.Shared.CCVar;
@@ -37,6 +38,7 @@ public sealed class StorageUIController : UIController, IOnSystemChanged<Storage
[Dependency] private readonly IConfigurationManager _configuration = default!; [Dependency] private readonly IConfigurationManager _configuration = default!;
[Dependency] private readonly IInputManager _input = default!; [Dependency] private readonly IInputManager _input = default!;
[Dependency] private readonly IPlayerManager _player = default!; [Dependency] private readonly IPlayerManager _player = default!;
[Dependency] private readonly CloseRecentWindowUIController _closeRecentWindowUIController = default!;
[UISystemDependency] private readonly StorageSystem _storage = default!; [UISystemDependency] private readonly StorageSystem _storage = default!;
[UISystemDependency] private readonly UserInterfaceSystem _ui = default!; [UISystemDependency] private readonly UserInterfaceSystem _ui = default!;
@@ -98,6 +100,7 @@ public sealed class StorageUIController : UIController, IOnSystemChanged<Storage
if (StaticStorageUIEnabled) if (StaticStorageUIEnabled)
{ {
UIManager.GetActiveUIWidgetOrNull<HotbarGui>()?.StorageContainer.AddChild(window); UIManager.GetActiveUIWidgetOrNull<HotbarGui>()?.StorageContainer.AddChild(window);
_closeRecentWindowUIController.SetMostRecentlyInteractedWindow(window);
} }
else else
{ {