sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-08 09:03:50 +09:00
Code Issues Packages Projects Releases Wiki Activity

Move the lookup type out of ISserialisableDrawableContainer

Browse Source
This commit is contained in:
Dean Herbert
2023-02-15 16:35:23 +09:00
parent a7b47f6503
commit e61d2d571c
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Overlays/SkinEditor/SkinEditor.cs
View File

@ -339,7 +339,7 @@ namespace osu.Game.Overlays.SkinEditor
settingsSidebar.Add(new SkinSettingsToolbox(component)); settingsSidebar.Add(new SkinSettingsToolbox(component));
} }
private IEnumerable<ISerialisableDrawableContainer> availableTargets => targetScreen.ChildrenOfType<ISerialisableDrawableContainer>(); private IEnumerable<SkinnableTargetContainer> availableTargets => targetScreen.ChildrenOfType<SkinnableTargetContainer>();
private ISerialisableDrawableContainer? getFirstTarget() => availableTargets.FirstOrDefault(); private ISerialisableDrawableContainer? getFirstTarget() => availableTargets.FirstOrDefault();
@ -350,7 +350,7 @@ namespace osu.Game.Overlays.SkinEditor
private void revert() private void revert()
{ {
ISerialisableDrawableContainer[] targetContainers = availableTargets.ToArray(); SkinnableTargetContainer[] targetContainers = availableTargets.ToArray();
foreach (var t in targetContainers) foreach (var t in targetContainers)
{ {
@ -370,7 +370,7 @@ namespace osu.Game.Overlays.SkinEditor
if (!hasBegunMutating) if (!hasBegunMutating)
return; return;
ISerialisableDrawableContainer[] targetContainers = availableTargets.ToArray(); SkinnableTargetContainer[] targetContainers = availableTargets.ToArray();
foreach (var t in targetContainers) foreach (var t in targetContainers)
currentSkin.Value.UpdateDrawableTarget(t); currentSkin.Value.UpdateDrawableTarget(t);

5
osu.Game/Skinning/ISerialisableDrawableContainer.cs
View File

@ -15,11 +15,6 @@ namespace osu.Game.Skinning
/// </summary> /// </summary>
public interface ISerialisableDrawableContainer : IDrawable public interface ISerialisableDrawableContainer : IDrawable
{ {
/// <summary>
/// The definition of this target.
/// </summary>
GlobalSkinComponentLookup.LookupType Target { get; }
/// <summary> /// <summary>
/// A bindable list of components which are being tracked by this skinnable target. /// A bindable list of components which are being tracked by this skinnable target.
/// </summary> /// </summary>

6
osu.Game/Skinning/Skin.cs
View File

@ -143,7 +143,7 @@ namespace osu.Game.Skinning
/// Remove all stored customisations for the provided target. /// Remove all stored customisations for the provided target.
/// </summary> /// </summary>
/// <param name="targetContainer">The target container to reset.</param> /// <param name="targetContainer">The target container to reset.</param>
public void ResetDrawableTarget(ISerialisableDrawableContainer targetContainer) public void ResetDrawableTarget(SkinnableTargetContainer targetContainer)
{ {
DrawableComponentInfo.Remove(targetContainer.Target); DrawableComponentInfo.Remove(targetContainer.Target);
} }
@ -152,9 +152,9 @@ namespace osu.Game.Skinning
/// Update serialised information for the provided target. /// Update serialised information for the provided target.
/// </summary> /// </summary>
/// <param name="targetContainer">The target container to serialise to this skin.</param> /// <param name="targetContainer">The target container to serialise to this skin.</param>
public void UpdateDrawableTarget(ISerialisableDrawableContainer targetContainer) public void UpdateDrawableTarget(SkinnableTargetContainer targetContainer)
{ {
DrawableComponentInfo[targetContainer.Target] = targetContainer.CreateSerialisedInfo().ToArray(); DrawableComponentInfo[targetContainer.Target] = ((ISerialisableDrawableContainer)targetContainer).CreateSerialisedInfo().ToArray();
} }
public virtual Drawable? GetDrawableComponent(ISkinComponentLookup lookup) public virtual Drawable? GetDrawableComponent(ISkinComponentLookup lookup)