h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 08:13:15 +08:00
Code Issues Releases Wiki Activity

revert: remove attachment logic from SkinComponentContainer

Browse Source 
This is no longer in the scope of the PR.
This commit is contained in:
tsrk 2023-06-14 21:19:08 +02:00
parent e26aeea589
commit 081190802e
No known key found for this signature in database
GPG Key ID: EBD46BB3049B56D6
1 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
osu.Game/Skinning/SkinComponentsContainer.cs
View File

@ -6,10 +6,8 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Rulesets.UI;
namespace osu.Game.Skinning namespace osu.Game.Skinning
{ {
@ -41,8 +39,6 @@ namespace osu.Game.Skinning
private CancellationTokenSource? cancellationSource; private CancellationTokenSource? cancellationSource;
private ICanAttachHUDPieces? attachTarget;
public SkinComponentsContainer(SkinComponentsContainerLookup lookup) public SkinComponentsContainer(SkinComponentsContainerLookup lookup)
{ {
Lookup = lookup; Lookup = lookup;
@ -66,10 +62,6 @@ namespace osu.Game.Skinning
public void Reload(Container? componentsContainer) public void Reload(Container? componentsContainer)
{ {
components
.OfType<IAttachableSkinComponent>()
.ForEach(c => attachTarget?.Detach(c));
ClearInternal(); ClearInternal();
components.Clear(); components.Clear();
ComponentsLoaded = false; ComponentsLoaded = false;
@ -85,7 +77,6 @@ namespace osu.Game.Skinning
LoadComponentAsync(content, wrapper => LoadComponentAsync(content, wrapper =>
{ {
AddInternal(wrapper); AddInternal(wrapper);
wrapper.Children.OfType<IAttachableSkinComponent>().ForEach(c => attachTarget?.Attach(c));
components.AddRange(wrapper.Children.OfType<ISerialisableDrawable>()); components.AddRange(wrapper.Children.OfType<ISerialisableDrawable>());
ComponentsLoaded = true; ComponentsLoaded = true;
}, (cancellationSource = new CancellationTokenSource()).Token); }, (cancellationSource = new CancellationTokenSource()).Token);
@ -102,9 +93,6 @@ namespace osu.Game.Skinning
if (!(component is Drawable drawable)) if (!(component is Drawable drawable))
throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(component)); throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(component));
if (component is IAttachableSkinComponent attachableSkinComponent)
attachTarget?.Attach(attachableSkinComponent);
content.Add(drawable); content.Add(drawable);
components.Add(component); components.Add(component);
} }
@ -120,24 +108,10 @@ namespace osu.Game.Skinning
if (!(component is Drawable drawable)) if (!(component is Drawable drawable))
throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(component)); throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(component));
if (component is IAttachableSkinComponent attachableSkinComponent)
attachTarget?.Detach(attachableSkinComponent);
content.Remove(drawable, disposeImmediately); content.Remove(drawable, disposeImmediately);
components.Remove(component); components.Remove(component);
} }
public void SetAttachTarget(ICanAttachHUDPieces target)
{
attachTarget = target;
foreach (var child in InternalChildren)
{
if (child is IAttachableSkinComponent attachable)
attachTarget.Attach(attachable);
}
}
protected override void SkinChanged(ISkinSource skin) protected override void SkinChanged(ISkinSource skin)
{ {
base.SkinChanged(skin); base.SkinChanged(skin);