Skip to content

Commit 4fbff7c

Browse files
Escape menu window (AscensionGameDev#2590)
* Create EscapeMenuWindow With accompanied Designer file Signed-off-by: Derek Gooding <[email protected]> * Use new window * Add back in the json reading line. The old json asset will need to be removed. * normalize CloseButton and Button rendering, resolve CloseButton rendering issues * rename buttons, fixed visibility of modal and version panel * delete old escape menu * fix button width * fix button visibility * component state texture names --------- Signed-off-by: Derek Gooding <[email protected]> Co-authored-by: Robbie Lodico <[email protected]>
1 parent 10d3da6 commit 4fbff7c

File tree

17 files changed

+448
-349
lines changed

17 files changed

+448
-349
lines changed

Intersect.Client.Core/Interface/Game/EscapeMenu.cs

Lines changed: 0 additions & 207 deletions
This file was deleted.

Intersect.Client.Core/Interface/Game/GameInterface.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using Intersect.Client.Interface.Game.Inventory;
1111
using Intersect.Client.Interface.Game.Shop;
1212
using Intersect.Client.Interface.Game.Trades;
13+
using Intersect.Client.Interface.Menu;
1314
using Intersect.Client.Interface.Shared;
1415
using Intersect.Client.Networking;
1516
using Intersect.Core;
@@ -112,11 +113,11 @@ public GameInterface(Canvas canvas) : base(canvas)
112113
public Canvas GameCanvas { get; }
113114

114115
private AnnouncementWindow? _announcementWindow;
115-
private EscapeMenu? _escapeMenu;
116+
private EscapeMenuWindow? _escapeMenu;
116117
private SimplifiedEscapeMenu? _simplifiedEscapeMenu;
117118
private TargetContextMenu? _targetContextMenu;
118119

119-
public EscapeMenu EscapeMenu => _escapeMenu ??= new EscapeMenu(GameCanvas, GetOrCreateSettingsWindow)
120+
public EscapeMenuWindow EscapeMenu => _escapeMenu ??= new EscapeMenuWindow(GameCanvas, GetOrCreateSettingsWindow)
120121
{
121122
IsHidden = true,
122123
};

Intersect.Client.Core/Interface/Menu/EscapeMenuWindow.Designer.cs

Lines changed: 52 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)