From 278b25bcbd6568c6da03e0c25934d089a928bd63 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 23 Feb 2018 15:29:56 +0900
Subject: [PATCH] Fix border being the wrong size

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs  | 45 +++++++++-----------
 osu.Game/Rulesets/Edit/Layers/BorderLayer.cs | 38 +++++++++++++++++
 osu.Game/osu.Game.csproj                     |  1 +
 3 files changed, 59 insertions(+), 25 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/Layers/BorderLayer.cs

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 2a799a460f..e6a51cc39b 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -4,14 +4,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenTK.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Logging;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Layers;
 using osu.Game.Rulesets.Edit.Layers.Selection;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.UI;
@@ -50,17 +49,26 @@ namespace osu.Game.Rulesets.Edit
                 return;
             }
 
-            ScalableContainer createLayerContainerWithContent(params Drawable[] content)
-            {
-                var container = CreateLayerContainer();
-                container.Children = content;
-                layerContainers.Add(container);
-                return container;
-            }
-
             HitObjectOverlayLayer hitObjectOverlayLayer = CreateHitObjectOverlayLayer();
             SelectionLayer selectionLayer = new SelectionLayer(rulesetContainer.Playfield);
 
+            var layerBelowRuleset = new BorderLayer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Child = CreateLayerContainer()
+            };
+
+            var layerAboveRuleset = CreateLayerContainer();
+            layerAboveRuleset.Children = new Drawable[]
+            {
+                selectionLayer, // Below object overlays for input
+                hitObjectOverlayLayer,
+                selectionLayer.CreateProxy() // Proxy above object overlays for selections
+            };
+
+            layerContainers.Add(layerBelowRuleset);
+            layerContainers.Add(layerAboveRuleset);
+
             RadioButtonCollection toolboxCollection;
             InternalChild = new GridContainer
             {
@@ -85,22 +93,9 @@ namespace osu.Game.Rulesets.Edit
                             RelativeSizeAxes = Axes.Both,
                             Children = new Drawable[]
                             {
-                                createLayerContainerWithContent(new Container
-                                {
-                                    Name = "Border",
-                                    RelativeSizeAxes = Axes.Both,
-                                    Masking = true,
-                                    BorderColour = Color4.White,
-                                    BorderThickness = 2,
-                                    Child = new Box { RelativeSizeAxes = Axes.Both, Alpha = 0, AlwaysPresent = true }
-                                }),
+                                layerBelowRuleset,
                                 rulesetContainer,
-                                createLayerContainerWithContent
-                                (
-                                    selectionLayer, // Below object overlays for input
-                                    hitObjectOverlayLayer,
-                                    selectionLayer.CreateProxy() // Proxy above object overlays for selections
-                                )
+                                layerAboveRuleset
                             }
                         }
                     },
diff --git a/osu.Game/Rulesets/Edit/Layers/BorderLayer.cs b/osu.Game/Rulesets/Edit/Layers/BorderLayer.cs
new file mode 100644
index 0000000000..54c30b8d89
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Layers/BorderLayer.cs
@@ -0,0 +1,38 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using OpenTK.Graphics;
+
+namespace osu.Game.Rulesets.Edit.Layers
+{
+    public class BorderLayer : Container
+    {
+        protected override Container<Drawable> Content => content;
+        private readonly Container content;
+
+        public BorderLayer()
+        {
+            InternalChildren = new Drawable[]
+            {
+                new Container
+                {
+                    Name = "Border",
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    BorderColour = Color4.White,
+                    BorderThickness = 2,
+                    Child = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0,
+                        AlwaysPresent = true
+                    }
+                },
+                content = new Container { RelativeSizeAxes = Axes.Both }
+            };
+        }
+    }
+}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 5bd279d2a8..2fe059cb84 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -348,6 +348,7 @@
     <Compile Include="Overlays\Settings\Sections\Maintenance\DeleteAllBeatmapsDialog.cs" />
     <Compile Include="Rulesets\Configuration\IRulesetConfigManager.cs" />
     <Compile Include="Rulesets\Configuration\RulesetConfigManager.cs" />
+    <Compile Include="Rulesets\Edit\Layers\BorderLayer.cs" />
     <Compile Include="Rulesets\Edit\Layers\Selection\CaptureBox.cs" />
     <Compile Include="Rulesets\Edit\Layers\Selection\HitObjectOverlay.cs" />
     <Compile Include="Rulesets\Edit\Layers\Selection\HitObjectOverlayLayer.cs" />