Skip to content

Escape menu window #2590

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

Merged
pandinocoder merged 9 commits into from
Feb 27, 2025
Merged

Escape menu window #2590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bbedd5c
Create EscapeMenuWindow
DerekGooding Feb 17, 2025
bb06da0
Use new window
DerekGooding Feb 17, 2025
43e45f1
Add back in the json reading line. The old json asset will need to be…
DerekGooding Feb 17, 2025
e2d84ab
normalize CloseButton and Button rendering, resolve CloseButton rende…
pandinocoder Feb 27, 2025
bd9f3a8
rename buttons, fixed visibility of modal and version panel
pandinocoder Feb 27, 2025
5a49efe
delete old escape menu
pandinocoder Feb 27, 2025
e0c39a5
fix button width
pandinocoder Feb 27, 2025
0da8597
fix button visibility
pandinocoder Feb 27, 2025
0b01984
component state texture names
pandinocoder Feb 27, 2025
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
207 changes: 0 additions & 207 deletions Intersect.Client.Core/Interface/Game/EscapeMenu.cs
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions Intersect.Client.Core/Interface/Game/GameInterface.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using Intersect.Client.Interface.Game.Inventory;
using Intersect.Client.Interface.Game.Shop;
using Intersect.Client.Interface.Game.Trades;
using Intersect.Client.Interface.Menu;
using Intersect.Client.Interface.Shared;
using Intersect.Client.Networking;
using Intersect.Core;
Expand Down Expand Up @@ -112,11 +113,11 @@ public GameInterface(Canvas canvas) : base(canvas)
public Canvas GameCanvas { get; }

private AnnouncementWindow? _announcementWindow;
private EscapeMenu? _escapeMenu;
private EscapeMenuWindow? _escapeMenu;
private SimplifiedEscapeMenu? _simplifiedEscapeMenu;
private TargetContextMenu? _targetContextMenu;

public EscapeMenu EscapeMenu => _escapeMenu ??= new EscapeMenu(GameCanvas, GetOrCreateSettingsWindow)
public EscapeMenuWindow EscapeMenu => _escapeMenu ??= new EscapeMenuWindow(GameCanvas, GetOrCreateSettingsWindow)
{
IsHidden = true,
};
Expand Down
52 changes: 52 additions & 0 deletions Intersect.Client.Core/Interface/Menu/EscapeMenuWindow.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading