sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

DragLayer -> DragBox

Browse Source
This commit is contained in:
smoogipoo
2018-11-06 17:24:38 +09:00
parent 5eecdffa5d
commit faab744cbd
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
View File

@ -29,7 +29,7 @@ namespace osu.Game.Tests.Visual
public override IReadOnlyList<Type> RequiredTypes => new[] public override IReadOnlyList<Type> RequiredTypes => new[]
{ {
typeof(MaskSelection), typeof(MaskSelection),
typeof(DragLayer), typeof(DragBox),
typeof(HitObjectComposer), typeof(HitObjectComposer),
typeof(OsuHitObjectComposer), typeof(OsuHitObjectComposer),
typeof(HitObjectMaskLayer), typeof(HitObjectMaskLayer),

11
osu.Game/Screens/Edit/Screens/Compose/Layers/DragLayer.cs → osu.Game/Screens/Edit/Screens/Compose/Layers/DragBox.cs
View File

@ -8,15 +8,14 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Primitives;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Game.Rulesets.Edit;
using OpenTK.Graphics; using OpenTK.Graphics;
namespace osu.Game.Screens.Edit.Screens.Compose.Layers namespace osu.Game.Screens.Edit.Screens.Compose.Layers
{ {
/// <summary> /// <summary>
/// A layer that handles and displays drag selection for a collection of <see cref="SelectionMask"/>s. /// A box that displays the drag selection and provides selection events for users to handle.
/// </summary> /// </summary>
public class DragLayer : CompositeDrawable public class DragBox : CompositeDrawable
{ {
private readonly Action<RectangleF> performSelection; private readonly Action<RectangleF> performSelection;
@ -28,10 +27,10 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Layers
private Drawable box; private Drawable box;
/// <summary> /// <summary>
/// Creates a new <see cref="DragLayer"/>. /// Creates a new <see cref="DragBox"/>.
/// </summary> /// </summary>
/// <param name="maskContainer">The selectable <see cref="SelectionMask"/>s.</param> /// <param name="performSelection">A delegate that performs drag selection.</param>
public DragLayer(Action<RectangleF> performSelection) public DragBox(Action<RectangleF> performSelection)
{ {
this.performSelection = performSelection; this.performSelection = performSelection;

8
osu.Game/Screens/Edit/Screens/Compose/Layers/HitObjectMaskLayer.cs
View File

@ -37,15 +37,15 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Layers
maskSelection.DeselectAll = maskContainer.DeselectAll; maskSelection.DeselectAll = maskContainer.DeselectAll;
var dragLayer = new DragLayer(maskContainer.Select); var dragBox = new DragBox(maskContainer.Select);
dragLayer.DragEnd += () => maskSelection.UpdateVisibility(); dragBox.DragEnd += () => maskSelection.UpdateVisibility();
InternalChildren = new[] InternalChildren = new[]
{ {
dragLayer, dragBox,
maskSelection, maskSelection,
maskContainer, maskContainer,
dragLayer.CreateProxy() dragBox.CreateProxy()
}; };
foreach (var obj in composer.HitObjects) foreach (var obj in composer.HitObjects)