From faa921ba05790c42ee9d6df15f360bb032023bab Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 8 Dec 2017 17:41:10 +0900
Subject: [PATCH] Fix up post-merge issues

---
 osu-framework                                             | 2 +-
 ...layfieldOverlay.cs => TestCaseEditorSelectionLayer.cs} | 8 ++++----
 osu.Game.Tests/osu.Game.Tests.csproj                      | 2 +-
 .../Edit/{PlayfieldOverlay.cs => SelectionLayer.cs}       | 4 ++--
 osu.Game/osu.Game.csproj                                  | 1 +
 5 files changed, 9 insertions(+), 8 deletions(-)
 rename osu.Game.Tests/Visual/{TestCaseEditorPlayfieldOverlay.cs => TestCaseEditorSelectionLayer.cs} (87%)
 rename osu.Game/Rulesets/Edit/{PlayfieldOverlay.cs => SelectionLayer.cs} (94%)

diff --git a/osu-framework b/osu-framework
index d231ca9f79..797a351db2 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit d231ca9f79936f3a7f3cff0c7721587755ae168c
+Subproject commit 797a351db2e852fef5296453641ffbf6b2f6dc11
diff --git a/osu.Game.Tests/Visual/TestCaseEditorPlayfieldOverlay.cs b/osu.Game.Tests/Visual/TestCaseEditorSelectionLayer.cs
similarity index 87%
rename from osu.Game.Tests/Visual/TestCaseEditorPlayfieldOverlay.cs
rename to osu.Game.Tests/Visual/TestCaseEditorSelectionLayer.cs
index f0da23955d..79f3e4f1d3 100644
--- a/osu.Game.Tests/Visual/TestCaseEditorPlayfieldOverlay.cs
+++ b/osu.Game.Tests/Visual/TestCaseEditorSelectionLayer.cs
@@ -16,11 +16,11 @@ using osu.Game.Rulesets.Osu.UI;
 
 namespace osu.Game.Tests.Visual
 {
-    public class TestCaseEditorPlayfieldOverlay : OsuTestCase
+    public class TestCaseEditorSelectionLayer : OsuTestCase
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(PlayfieldOverlay) };
+        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(SelectionLayer) };
 
-        public TestCaseEditorPlayfieldOverlay()
+        public TestCaseEditorSelectionLayer()
         {
             var playfield = new OsuEditPlayfield();
             playfield.Add(new DrawableHitCircle(new HitCircle { Position = new Vector2(256, 192), Scale = 0.5f }));
@@ -47,7 +47,7 @@ namespace osu.Game.Tests.Visual
                     Clock = new FramedClock(new StopwatchClock()),
                     Child = playfield
                 },
-                new PlayfieldOverlay(playfield)
+                new SelectionLayer(playfield)
             };
         }
     }
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index b7536112e3..1596e7e961 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -108,7 +108,7 @@
     <Compile Include="Visual\TestCaseEditorComposeTimeline.cs" />
     <Compile Include="Visual\TestCaseEditorMenuBar.cs" />
     <Compile Include="Visual\TestCaseEditorSummaryTimeline.cs" />
-    <Compile Include="Visual\TestCaseEditorPlayfieldOverlay.cs" />
+    <Compile Include="Visual\TestCaseEditorSelectionLayer.cs" />
     <Compile Include="Visual\TestCaseGamefield.cs" />
     <Compile Include="Visual\TestCaseGraph.cs" />
     <Compile Include="Visual\TestCaseIconButton.cs" />
diff --git a/osu.Game/Rulesets/Edit/PlayfieldOverlay.cs b/osu.Game/Rulesets/Edit/SelectionLayer.cs
similarity index 94%
rename from osu.Game/Rulesets/Edit/PlayfieldOverlay.cs
rename to osu.Game/Rulesets/Edit/SelectionLayer.cs
index 98b3bce265..cfe5f8ae5e 100644
--- a/osu.Game/Rulesets/Edit/PlayfieldOverlay.cs
+++ b/osu.Game/Rulesets/Edit/SelectionLayer.cs
@@ -17,7 +17,7 @@ using osu.Game.Graphics;
 
 namespace osu.Game.Rulesets.Edit
 {
-    public class PlayfieldOverlay : CompositeDrawable
+    public class SelectionLayer : CompositeDrawable
     {
         private readonly static Color4 selection_normal_colour = Color4.White;
         private readonly static Color4 selection_attached_colour = OsuColour.FromHex("eeaa00");
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Edit
 
         private readonly Playfield playfield;
 
-        public PlayfieldOverlay(Playfield playfield)
+        public SelectionLayer(Playfield playfield)
         {
             this.playfield = playfield;
 
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 660d7cb5e6..d74774e403 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -565,6 +565,7 @@
     <Compile Include="Rulesets\Edit\Tools\ICompositionTool.cs" />
     <Compile Include="Rulesets\Edit\HitObjectComposer.cs" />
     <Compile Include="Rulesets\Edit\SelectionDragger.cs" />
+    <Compile Include="Rulesets\Edit\SelectionLayer.cs" />
     <Compile Include="Rulesets\Edit\ToolboxGroup.cs" />
     <Compile Include="Rulesets\Judgements\DrawableJudgement.cs" />
     <Compile Include="Rulesets\Judgements\Judgement.cs" />