From 399994053887fef435980372252f33fbb6ade4f6 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Mon, 18 Dec 2017 19:16:33 +0900 Subject: [PATCH] DragSelector -> HitObjectSelectionBox --- ...{DragSelector.cs => HitObjectSelectionBox.cs} | 6 +++--- .../Rulesets/Edit/Layers/Selection/Marker.cs | 2 +- .../Edit/Layers/Selection/SelectionLayer.cs | 16 ++++++++-------- osu.Game/osu.Game.csproj | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) rename osu.Game/Rulesets/Edit/Layers/Selection/{DragSelector.cs => HitObjectSelectionBox.cs} (94%) diff --git a/osu.Game/Rulesets/Edit/Layers/Selection/DragSelector.cs b/osu.Game/Rulesets/Edit/Layers/Selection/HitObjectSelectionBox.cs similarity index 94% rename from osu.Game/Rulesets/Edit/Layers/Selection/DragSelector.cs rename to osu.Game/Rulesets/Edit/Layers/Selection/HitObjectSelectionBox.cs index 2201a661b7..6ea2778a9e 100644 --- a/osu.Game/Rulesets/Edit/Layers/Selection/DragSelector.cs +++ b/osu.Game/Rulesets/Edit/Layers/Selection/HitObjectSelectionBox.cs @@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Edit.Layers.Selection /// /// A box that represents a drag selection. /// - public class DragSelector : CompositeDrawable + public class HitObjectSelectionBox : CompositeDrawable { public readonly Bindable Selection = new Bindable(); @@ -37,10 +37,10 @@ namespace osu.Game.Rulesets.Edit.Layers.Selection private readonly Vector2 startPos; /// - /// Creates a new . + /// Creates a new . /// /// The point at which the drag was initiated, in the parent's coordinates. - public DragSelector(Vector2 startPos) + public HitObjectSelectionBox(Vector2 startPos) { this.startPos = startPos; diff --git a/osu.Game/Rulesets/Edit/Layers/Selection/Marker.cs b/osu.Game/Rulesets/Edit/Layers/Selection/Marker.cs index cee6ac63d5..956415a800 100644 --- a/osu.Game/Rulesets/Edit/Layers/Selection/Marker.cs +++ b/osu.Game/Rulesets/Edit/Layers/Selection/Marker.cs @@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Edit.Layers.Selection { /// /// Represents a marker visible on the border of a which exposes - /// properties that are used to resize a . + /// properties that are used to resize a . /// public class Marker : CompositeDrawable { diff --git a/osu.Game/Rulesets/Edit/Layers/Selection/SelectionLayer.cs b/osu.Game/Rulesets/Edit/Layers/Selection/SelectionLayer.cs index 392883daa5..98bcfd0ec8 100644 --- a/osu.Game/Rulesets/Edit/Layers/Selection/SelectionLayer.cs +++ b/osu.Game/Rulesets/Edit/Layers/Selection/SelectionLayer.cs @@ -22,39 +22,39 @@ namespace osu.Game.Rulesets.Edit.Layers.Selection RelativeSizeAxes = Axes.Both; } - private DragSelector selector; + private HitObjectSelectionBox selectionBoxBox; protected override bool OnDragStart(InputState state) { // Hide the previous drag box - we won't be working with it any longer - selector?.Hide(); + selectionBoxBox?.Hide(); - AddInternal(selector = new DragSelector(ToLocalSpace(state.Mouse.NativeState.Position)) + AddInternal(selectionBoxBox = new HitObjectSelectionBox(ToLocalSpace(state.Mouse.NativeState.Position)) { CapturableObjects = playfield.HitObjects.Objects, }); - Selection.BindTo(selector.Selection); + Selection.BindTo(selectionBoxBox.Selection); return true; } protected override bool OnDrag(InputState state) { - selector.DragEndPosition = ToLocalSpace(state.Mouse.NativeState.Position); - selector.BeginCapture(); + selectionBoxBox.DragEndPosition = ToLocalSpace(state.Mouse.NativeState.Position); + selectionBoxBox.BeginCapture(); return true; } protected override bool OnDragEnd(InputState state) { - selector.FinishCapture(); + selectionBoxBox.FinishCapture(); return true; } protected override bool OnClick(InputState state) { - selector?.Hide(); + selectionBoxBox?.Hide(); return true; } } diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index fca3f57413..514f91f80a 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -308,7 +308,7 @@ - +