Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix Client EuiManager (#10898)

Browse Source 
* Fix EuiManager cleanup

* cleanup

* This seems to work better
This commit is contained in:
wrexbe
2022-08-27 22:17:30 -07:00
committed by GitHub
parent 4bdb029172
commit 9d2a76e2d4
2 changed files with 61 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Content.Client/Eui/EuiManager.cs
View File

@@ -1,9 +1,12 @@
using System;
using System.Collections.Generic;
using Content.Shared.Eui;
using Robust.Client.GameStates;
using Robust.Client.State;
using Robust.Shared.IoC;
using Robust.Shared.Network;
using Robust.Shared.Reflection;
using Robust.Shared.Utility;
namespace Content.Client.Eui
{
@@ -20,6 +23,16 @@ namespace Content.Client.Eui
_net.RegisterNetMessage<MsgEuiCtl>(RxMsgCtl);
_net.RegisterNetMessage<MsgEuiState>(RxMsgState);
_net.RegisterNetMessage<MsgEuiMessage>(RxMsgMessage);
_net.Disconnect += NetOnDisconnect;
}
private void NetOnDisconnect(object? sender, NetDisconnectedArgs e)
{
foreach (var openUi in _openUis)
{
openUi.Value.Eui.Closed();
}
_openUis.Clear();
}
private void RxMsgMessage(MsgEuiMessage message)
@@ -36,26 +49,22 @@ namespace Content.Client.Eui
private void RxMsgCtl(MsgEuiCtl message)
{
switch (message.Type)
// Will always close the window first when getting a control message
if (_openUis.TryGetValue(message.Id, out var openEui))
{
case MsgEuiCtl.CtlType.Open:
var euiType = _refl.LooseGetType(message.OpenType);
var instance = _dtf.CreateInstance<BaseEui>(euiType);
instance.Initialize(this, message.Id);
instance.Opened();
_openUis.Add(message.Id, new EuiData(instance));
break;
case MsgEuiCtl.CtlType.Close:
var dat = _openUis[message.Id];
dat.Eui.Closed();
_openUis.Remove(message.Id);
break;
default:
throw new ArgumentOutOfRangeException();
openEui.Eui.Closed();
_openUis.Remove(message.Id);
}
if (message.Type != MsgEuiCtl.CtlType.Open)
return;
// Will open/re-open the window if the server wants the eui opened.
var euiType = _refl.LooseGetType(message.OpenType);
var instance = _dtf.CreateInstance<BaseEui>(euiType);
instance.Initialize(this, message.Id);
instance.Opened();
_openUis.Add(message.Id, new EuiData(instance));
}
private sealed class EuiData