h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 13:32:54 +08:00
Code Issues Releases Wiki Activity

MaskSelection -> SelectionBox

Browse Source
This commit is contained in:
smoogipoo 2018-11-06 17:52:47 +09:00
parent 65bb91dcf7
commit ad2836a61e
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
osu.Game/Rulesets/Edit/HitObjectComposer.cs
View File

@ -165,10 +165,10 @@ namespace osu.Game.Rulesets.Edit
public virtual SelectionMask CreateMaskFor(DrawableHitObject hitObject) => null;
/// <summary>
/// Creates a <see cref="MaskSelection"/> which outlines <see cref="DrawableHitObject"/>s
/// Creates a <see cref="SelectionBox"/> which outlines <see cref="DrawableHitObject"/>s
/// and handles hitobject pattern adjustments.
/// </summary>
public virtual MaskSelection CreateMaskSelection() => new MaskSelection();
public virtual SelectionBox CreateMaskSelection() => new SelectionBox();
/// <summary>
/// Creates a <see cref="ScalableContainer"/> which provides a layer above or below the <see cref="Playfield"/>.

18
osu.Game/Screens/Edit/Screens/Compose/Layers/BlueprintContainer.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Layers
public class BlueprintContainer : CompositeDrawable
{
private SelectionBlueprintContainer selectionBlueprints;
private MaskSelection maskSelection;
private SelectionBox selectionBox;
private IEnumerable<SelectionMask> aliveMasks => selectionBlueprints.Children.Where(c => c.IsAlive);
@ -33,16 +33,16 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Layers
[BackgroundDependencyLoader]
private void load()
{
maskSelection = composer.CreateMaskSelection();
maskSelection.DeselectAll = deselectAll;
selectionBox = composer.CreateMaskSelection();
selectionBox.DeselectAll = deselectAll;
var dragBox = new DragBox(select);
dragBox.DragEnd += () => maskSelection.UpdateVisibility();
dragBox.DragEnd += () => selectionBox.UpdateVisibility();
InternalChildren = new[]
{
dragBox,
maskSelection,
selectionBox,
selectionBlueprints = new SelectionBlueprintContainer { RelativeSizeAxes = Axes.Both },
dragBox.CreateProxy()
};
@ -117,19 +117,19 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Layers
private void onMaskSelected(SelectionMask mask)
{
maskSelection.HandleSelected(mask);
selectionBox.HandleSelected(mask);
selectionBlueprints.ChangeChildDepth(mask, 1);
}
private void onMaskDeselected(SelectionMask mask)
{
maskSelection.HandleDeselected(mask);
selectionBox.HandleDeselected(mask);
selectionBlueprints.ChangeChildDepth(mask, 0);
}
private void onSelectionRequested(SelectionMask mask, InputState state) => maskSelection.HandleSelectionRequested(mask, state);
private void onSelectionRequested(SelectionMask mask, InputState state) => selectionBox.HandleSelectionRequested(mask, state);
private void onDragRequested(SelectionMask mask, Vector2 delta, InputState state) => maskSelection.HandleDrag(mask, delta, state);
private void onDragRequested(SelectionMask mask, Vector2 delta, InputState state) => selectionBox.HandleDrag(mask, delta, state);
private class SelectionBlueprintContainer : Container<SelectionMask>
{

2
osu.Game/Screens/Edit/Screens/Compose/Layers/DragBox.cs
View File

@ -46,7 +46,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Layers
{
Masking = true,
BorderColour = Color4.White,
BorderThickness = MaskSelection.BORDER_RADIUS,
BorderThickness = SelectionBox.BORDER_RADIUS,
Child = new Box
{
RelativeSizeAxes = Axes.Both,

6
osu.Game/Screens/Edit/Screens/Compose/Layers/MaskSelection.cs → osu.Game/Screens/Edit/Screens/Compose/Layers/SelectionBox.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Layers
/// <summary>
/// A box which surrounds <see cref="SelectionMask"/>s and provides interactive handles, context menus etc.
/// </summary>
public class MaskSelection : CompositeDrawable
public class SelectionBox : CompositeDrawable
{
public const float BORDER_RADIUS = 2;
@ -32,7 +32,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Layers
[Resolved]
private IPlacementHandler placementHandler { get; set; }
public MaskSelection()
public SelectionBox()
{
selectedMasks = new List<SelectionMask>();
@ -147,7 +147,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Layers
#endregion
/// <summary>
/// Updates whether this <see cref="MaskSelection"/> is visible.
/// Updates whether this <see cref="SelectionBox"/> is visible.
/// </summary>
internal void UpdateVisibility()
{