Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better Inventory Window Positioning #30058

Closed
wants to merge 2 commits into from
Closed

Better Inventory Window Positioning #30058

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02599dc
What I want, as a starter
Jul 15, 2024
7328a7b
accounts for the height from the bottom of the screen
Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 28 additions & 3 deletions Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ public sealed class StorageUIController : UIController, IOnSystemChanged<Storage
private StorageContainer? _container;

private Vector2? _lastContainerPosition;
private float? _lastContainerWidth;
private float? _lastContainerHeight;

private HotbarGui? Hotbar => UIManager.GetActiveUIWidgetOrNull<HotbarGui>();

Expand Down Expand Up @@ -100,7 +102,31 @@ private void OnStorageOrderChanged(Entity<StorageComponent>? nullEnt)
? _lastContainerPosition.Value
: Vector2.Zero;

LayoutContainer.SetPosition(_container, pos);
if (_lastContainerWidth != null && _lastContainerHeight != null)
{
// when opening bags of different sizes,
// the goal is to make the window centered on the middle of bag window regardless of bag size
// we can achieve this by finding the center of the last bag's window,
// and then subtracting half the size of the new bag's window
var centerOfBagWindow = pos.X + _lastContainerWidth.Value / 2;
var offsetFromCenterByNewBagWidth = _container.Width / 2;
var xCoordBasedOnCenter = centerOfBagWindow - offsetFromCenterByNewBagWidth;

// as for the Y value, the goal is to maintain the height gap between the bottom of the storage window and the screen
// we can do that by calculating the gap from the bottom of the window to the bottom of the screen
var distanceFromBottom = pos.Y + _lastContainerHeight.Value - _ui.WindowRoot.Height;
// then subtracting the size of the screen by that, and then subtracting by the height of the new bag window
// to place the window in the correct position on the Y axis
var yCoordBasedOnDistanceFromBottom = _ui.WindowRoot.Height - distanceFromBottom - _container.Height;
LayoutContainer.SetPosition(_container, new Vector2(xCoordBasedOnCenter, yCoordBasedOnDistanceFromBottom));
}
else
{
LayoutContainer.SetPosition(_container, pos);
}

_lastContainerWidth = _container.Width;
_lastContainerHeight = _container.Height;
}

if (StaticStorageUIEnabled)
Expand All @@ -109,13 +135,12 @@ private void OnStorageOrderChanged(Entity<StorageComponent>? nullEnt)
_container.Orphan();
Hotbar?.StorageContainer.AddChild(_container);
}
_lastContainerPosition = _container.GlobalPosition;
}
else
{
_lastContainerPosition = _container.GlobalPosition;
_container.Close();
}
_lastContainerPosition = _container.GlobalPosition;
}

private void OnStaticStorageChanged(bool obj)
Expand Down