tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove usages of obsolete SpriteView.Sprite.set() (#19500)

Browse Source
This commit is contained in:
Visne
2023-08-25 03:16:46 +02:00
committed by GitHub
parent 3c667b6f7e
commit 11a57be230
20 changed files with 72 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
View File

@@ -203,13 +203,12 @@ public sealed class ActionButton : Control
return;
}
if (Action?.EntityIcon == null ||
!entityManager.TryGetComponent(Action.EntityIcon.Value, out SpriteComponent? sprite))
if (Action?.EntityIcon is not { } entity || !entityManager.HasComponent<SpriteComponent>(entity))
{
_bigItemSpriteView.Visible = false;
_bigItemSpriteView.Sprite = null;
_bigItemSpriteView.SetEntity(null);
_smallItemSpriteView.Visible = false;
_smallItemSpriteView.Sprite = null;
_smallItemSpriteView.SetEntity(null);
}
else
{
@@ -217,24 +216,21 @@ public sealed class ActionButton : Control
{
case ItemActionIconStyle.BigItem:
_bigItemSpriteView.Visible = true;
_bigItemSpriteView.Sprite = sprite;
_bigItemSpriteView.SetEntity(entity);
_smallItemSpriteView.Visible = false;
_smallItemSpriteView.Sprite = null;
_smallItemSpriteView.SetEntity(null);
break;
case ItemActionIconStyle.BigAction:
_bigItemSpriteView.Visible = false;
_bigItemSpriteView.Sprite = null;
_bigItemSpriteView.SetEntity(null);
_smallItemSpriteView.Visible = true;
_smallItemSpriteView.Sprite = sprite;
_smallItemSpriteView.SetEntity(entity);
break;
case ItemActionIconStyle.NoItem:
_bigItemSpriteView.Visible = false;
_bigItemSpriteView.Sprite = null;
_bigItemSpriteView.SetEntity(null);
_smallItemSpriteView.Visible = false;
_smallItemSpriteView.Sprite = null;
_smallItemSpriteView.SetEntity(null);
break;
}
}