From 4196bb8c245d4b79d1d7d1ebb3f56b06708618c9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Apr 2018 16:24:13 +0900
Subject: [PATCH] Move selection logic to MaskContainer

---
 .../Edit/Screens/Compose/Layers/DragLayer.cs     |  9 +--------
 .../Edit/Screens/Compose/Layers/MaskContainer.cs | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Edit/Screens/Compose/Layers/DragLayer.cs b/osu.Game/Screens/Edit/Screens/Compose/Layers/DragLayer.cs
index 5ad2aeb0e2..8ed9cab79d 100644
--- a/osu.Game/Screens/Edit/Screens/Compose/Layers/DragLayer.cs
+++ b/osu.Game/Screens/Edit/Screens/Compose/Layers/DragLayer.cs
@@ -78,14 +78,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Layers
             box.Position = topLeft;
             box.Size = bottomRight - topLeft;
 
-            foreach (var mask in maskContainer.AliveMasks)
-            {
-                if (mask.IsPresent && dragRectangle.Contains(mask.SelectionPoint))
-                    mask.Select();
-                else
-                    mask.Deselect();
-            }
-
+            maskContainer.Select(dragRectangle);
             return true;
         }
 
diff --git a/osu.Game/Screens/Edit/Screens/Compose/Layers/MaskContainer.cs b/osu.Game/Screens/Edit/Screens/Compose/Layers/MaskContainer.cs
index 89bae004b5..9aea17844a 100644
--- a/osu.Game/Screens/Edit/Screens/Compose/Layers/MaskContainer.cs
+++ b/osu.Game/Screens/Edit/Screens/Compose/Layers/MaskContainer.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Edit;
+using RectangleF = osu.Framework.Graphics.Primitives.RectangleF;
 
 namespace osu.Game.Screens.Edit.Screens.Compose.Layers
 {
@@ -48,6 +49,21 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Layers
             return result;
         }
 
+        /// <summary>
+        /// Select all masks in a given rectangle selection area.
+        /// </summary>
+        /// <param name="rect">The rectangle to perform a selection on in screen-space coordinates.</param>
+        public void Select(RectangleF rect)
+        {
+            foreach (var mask in AliveMasks)
+            {
+                if (mask.IsPresent && rect.Contains(mask.SelectionPoint))
+                    mask.Select();
+                else
+                    mask.Deselect();
+            }
+        }
+
         private void onMaskSelected(HitObjectMask mask) => MaskSelected?.Invoke(mask);
         private void onMaskDeselected(HitObjectMask mask) => MaskDeselected?.Invoke(mask);