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

Enable nullability in Content.Client (#3257)

Browse Source 
* Enable nullability in Content.Client

* Remove #nullable enable

* Merge fixes

* Remove Debug.Assert

* Merge fixes

* Fix build

* Fix build
This commit is contained in:
DrSmugleaf
2021-03-10 14:48:29 +01:00
committed by GitHub
parent 4f9bd4e802
commit 902aa128c2
270 changed files with 1774 additions and 1550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Client/GameObjects/Components/Access/IdCardConsoleBoundUserInterface.cs
View File

@@ -15,14 +15,13 @@ namespace Content.Client.GameObjects.Components.Access
{
}
private IdCardConsoleWindow _window;
private IdCardConsoleWindow? _window;
protected override void Open()
{
base.Open();
_window = new IdCardConsoleWindow(this, _prototypeManager);
_window.Title = Owner.Owner.Name;
_window = new IdCardConsoleWindow(this, _prototypeManager) {Title = Owner.Owner.Name};
_window.OnClose += Close;
_window.OpenCentered();
}
@@ -31,7 +30,7 @@ namespace Content.Client.GameObjects.Components.Access
{
base.UpdateState(state);
var castState = (IdCardConsoleBoundUserInterfaceState) state;
_window.UpdateState(castState);
_window?.UpdateState(castState);
}
public void ButtonPressed(UiButton button)

10
Content.Client/GameObjects/Components/Access/IdCardConsoleWindow.cs
View File

@@ -31,8 +31,8 @@ namespace Content.Client.GameObjects.Components.Access
private readonly Dictionary<string, Button> _accessButtons = new();
private string _lastFullName;
private string _lastJobTitle;
private string? _lastFullName;
private string? _lastJobTitle;
public IdCardConsoleWindow(IdCardConsoleBoundUserInterface owner, IPrototypeManager prototypeManager)
{
@@ -165,7 +165,7 @@ namespace Content.Client.GameObjects.Components.Access
_fullNameLineEdit.Editable = interfaceEnabled;
if (!fullNameDirty)
{
_fullNameLineEdit.Text = state.TargetIdFullName;
_fullNameLineEdit.Text = state.TargetIdFullName ?? "";
}
_fullNameSaveButton.Disabled = !interfaceEnabled || !fullNameDirty;
@@ -174,7 +174,7 @@ namespace Content.Client.GameObjects.Components.Access
_jobTitleLineEdit.Editable = interfaceEnabled;
if (!jobTitleDirty)
{
_jobTitleLineEdit.Text = state.TargetIdJobTitle;
_jobTitleLineEdit.Text = state.TargetIdJobTitle ?? "";
}
_jobTitleSaveButton.Disabled = !interfaceEnabled || !jobTitleDirty;
@@ -184,7 +184,7 @@ namespace Content.Client.GameObjects.Components.Access
button.Disabled = !interfaceEnabled;
if (interfaceEnabled)
{
button.Pressed = state.TargetIdAccessList.Contains(accessName);
button.Pressed = state.TargetIdAccessList?.Contains(accessName) ?? false;
}
}