From 2f025f196723c0711e1573962515cabb892daae7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 May 2021 18:51:23 +0900
Subject: [PATCH] SkinnableTargetWrapper -> SkinnableTargetComponentsContainer

---
 osu.Game/Skinning/DefaultSkin.cs                       |  2 +-
 osu.Game/Skinning/LegacySkin.cs                        |  2 +-
 osu.Game/Skinning/Skin.cs                              |  2 +-
 ...rapper.cs => SkinnableTargetComponentsContainer.cs} | 10 +++++-----
 osu.Game/Skinning/SkinnableTargetContainer.cs          |  4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename osu.Game/Skinning/{SkinnableTargetWrapper.cs => SkinnableTargetComponentsContainer.cs} (73%)

diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index d6ca5e9009..65e8fd1b82 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Skinning
                     switch (target.Target)
                     {
                         case SkinnableTarget.MainHUDComponents:
-                            var skinnableTargetWrapper = new SkinnableTargetWrapper(container =>
+                            var skinnableTargetWrapper = new SkinnableTargetComponentsContainer(container =>
                             {
                                 var score = container.OfType<DefaultScoreCounter>().FirstOrDefault();
                                 var accuracy = container.OfType<DefaultAccuracyCounter>().FirstOrDefault();
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 27f6fcdf97..a6f8f45c0f 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -332,7 +332,7 @@ namespace osu.Game.Skinning
                     {
                         case SkinnableTarget.MainHUDComponents:
 
-                            var skinnableTargetWrapper = new SkinnableTargetWrapper(container =>
+                            var skinnableTargetWrapper = new SkinnableTargetComponentsContainer(container =>
                             {
                                 var score = container.OfType<LegacyScoreCounter>().FirstOrDefault();
                                 var accuracy = container.OfType<GameplayAccuracyCounter>().FirstOrDefault();
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 0ceca3925e..2944c7a8ec 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Skinning
                     if (!DrawableComponentInfo.TryGetValue(target.Target, out var skinnableInfo))
                         return null;
 
-                    return new SkinnableTargetWrapper
+                    return new SkinnableTargetComponentsContainer
                     {
                         ChildrenEnumerable = skinnableInfo.Select(i => i.CreateInstance())
                     };
diff --git a/osu.Game/Skinning/SkinnableTargetWrapper.cs b/osu.Game/Skinning/SkinnableTargetComponentsContainer.cs
similarity index 73%
rename from osu.Game/Skinning/SkinnableTargetWrapper.cs
rename to osu.Game/Skinning/SkinnableTargetComponentsContainer.cs
index 395de590cf..2107ca7a8b 100644
--- a/osu.Game/Skinning/SkinnableTargetWrapper.cs
+++ b/osu.Game/Skinning/SkinnableTargetComponentsContainer.cs
@@ -9,11 +9,11 @@ using osu.Framework.Graphics.Containers;
 namespace osu.Game.Skinning
 {
     /// <summary>
-    /// A container which groups the elements of a <see cref="SkinnableTargetContainer"/> into a single object.
-    /// Optionally also applies a default layout to the elements.
+    /// A container which groups the components of a <see cref="SkinnableTargetContainer"/> into a single object.
+    /// Optionally also applies a default layout to the components.
     /// </summary>
     [Serializable]
-    public class SkinnableTargetWrapper : Container, ISkinnableDrawable
+    public class SkinnableTargetComponentsContainer : Container, ISkinnableDrawable
     {
         public bool IsEditable => false;
 
@@ -23,14 +23,14 @@ namespace osu.Game.Skinning
         /// Construct a wrapper with defaults that should be applied once.
         /// </summary>
         /// <param name="applyDefaults">A function to apply the default layout.</param>
-        public SkinnableTargetWrapper(Action<Container> applyDefaults)
+        public SkinnableTargetComponentsContainer(Action<Container> applyDefaults)
             : this()
         {
             this.applyDefaults = applyDefaults;
         }
 
         [JsonConstructor]
-        public SkinnableTargetWrapper()
+        public SkinnableTargetComponentsContainer()
         {
             RelativeSizeAxes = Axes.Both;
         }
diff --git a/osu.Game/Skinning/SkinnableTargetContainer.cs b/osu.Game/Skinning/SkinnableTargetContainer.cs
index 52e86f5d86..a4d7f621eb 100644
--- a/osu.Game/Skinning/SkinnableTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableTargetContainer.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Skinning
 {
     public class SkinnableTargetContainer : SkinReloadableDrawable, ISkinnableTarget
     {
-        private SkinnableTargetWrapper content;
+        private SkinnableTargetComponentsContainer content;
 
         public SkinnableTarget Target { get; }
 
@@ -31,7 +31,7 @@ namespace osu.Game.Skinning
             ClearInternal();
             components.Clear();
 
-            content = CurrentSkin.GetDrawableComponent(new SkinnableTargetComponent(Target)) as SkinnableTargetWrapper;
+            content = CurrentSkin.GetDrawableComponent(new SkinnableTargetComponent(Target)) as SkinnableTargetComponentsContainer;
 
             if (content != null)
             {