Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

4
Content.Client/Mech/Ui/MechEquipmentControl.xaml.cs
View File

@@ -10,11 +10,11 @@ public sealed partial class MechEquipmentControl : Control
{
public event Action? OnRemoveButtonPressed;
public MechEquipmentControl(string itemName, SpriteComponent? sprite, Control? fragment)
public MechEquipmentControl(EntityUid entity, string itemName, Control? fragment)
{
RobustXamlLoader.Load(this);
EquipmentName.SetMessage(itemName);
EquipmentView.Sprite = sprite;
EquipmentView.SetEntity(entity);
RemoveButton.TexturePath = "/Textures/Interface/Nano/cross.svg.png";
if (fragment != null)

10
Content.Client/Mech/Ui/MechMenu.xaml.cs
View File

@@ -23,10 +23,7 @@ public sealed partial class MechMenu : FancyWindow
_mech = mech;
if (!_ent.TryGetComponent<SpriteComponent>(mech, out var sprite))
return;
MechView.Sprite = sprite;
MechView.SetEntity(mech);
}
public void UpdateMechStats()
@@ -54,14 +51,13 @@ public sealed partial class MechMenu : FancyWindow
EquipmentControlContainer.Children.Clear();
foreach (var ent in mechComp.EquipmentContainer.ContainedEntities)
{
if (!_ent.TryGetComponent<SpriteComponent>(ent, out var sprite) ||
!_ent.TryGetComponent<MetaDataComponent>(ent, out var metaData))
if (!_ent.TryGetComponent<MetaDataComponent>(ent, out var metaData))
continue;
var uicomp = _ent.GetComponentOrNull<UIFragmentComponent>(ent);
var ui = uicomp?.Ui?.GetUIFragmentRoot();
var control = new MechEquipmentControl(metaData.EntityName, sprite, ui);
var control = new MechEquipmentControl(ent, metaData.EntityName, ui);
control.OnRemoveButtonPressed += () => OnRemoveButtonPressed?.Invoke(ent);