RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix drag breaking if scrolling while dragging

This commit is contained in:
smoogipoo 2018-11-26 16:08:56 +09:00
parent 60ffad169f
commit f9f300b215
6 changed files with 69 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
View File

@ -3,6 +3,7 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Input.Events;
using osu.Framework.Timing;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Mania.Objects.Drawables;
@ -14,6 +15,9 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
{
public class ManiaSelectionBlueprint : SelectionBlueprint
{
public Vector2 ScreenSpaceMouseDownPosition { get; private set; }
public Vector2 MouseDownPosition { get; private set; }
protected new DrawableManiaHitObject HitObject => (DrawableManiaHitObject)base.HitObject;
protected IClock EditorClock { get; private set; }
@ -43,6 +47,24 @@ protected override void Update()
Position = Parent.ToLocalSpace(HitObject.ToScreenSpace(Vector2.Zero));
}
protected override bool OnMouseDown(MouseDownEvent e)
{
ScreenSpaceMouseDownPosition = e.ScreenSpaceMousePosition;
MouseDownPosition = HitObject.ToLocalSpace(e.ScreenSpaceMousePosition);
return base.OnMouseDown(e);
}
protected override bool OnDrag(DragEvent e)
{
var result = base.OnDrag(e);
ScreenSpaceMouseDownPosition = e.ScreenSpaceMousePosition;
MouseDownPosition = HitObject.ToLocalSpace(e.ScreenSpaceMousePosition);
return result;
}
public override void Show()
{
HitObject.AlwaysAlive = true;

43
osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
View File

@ -5,6 +5,8 @@
using osu.Framework.Allocation;
using osu.Framework.Input.Events;
using osu.Framework.Timing;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Mania.Edit.Blueprints;
using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.UI;
using osu.Game.Rulesets.UI.Scrolling;
@ -29,11 +31,42 @@ private void load(IAdjustableClock clock)
editorClock = clock;
}
public override void HandleDrag(DragEvent dragEvent)
public override void HandleDrag(SelectionBlueprint blueprint, DragEvent dragEvent)
{
foreach (var blueprint in SelectedBlueprints)
adjustOrigins((ManiaSelectionBlueprint)blueprint);
performDragMovement(dragEvent);
performColumnMovement(dragEvent);
base.HandleDrag(blueprint, dragEvent);
}
/// <summary>
/// Ensures that the position of hitobjects remains centred to the mouse position.
/// E.g. The hitobject position will change if the editor scrolls while a hitobject is dragged.
/// </summary>
/// <param name="reference">The <see cref="ManiaSelectionBlueprint"/> that received the drag event.</param>
private void adjustOrigins(ManiaSelectionBlueprint reference)
{
var referenceParent = (HitObjectContainer)reference.HitObject.Parent;
float offsetFromReferenceOrigin = reference.MouseDownPosition.Y - reference.HitObject.OriginPosition.Y;
float targetPosition = referenceParent.ToLocalSpace(reference.ScreenSpaceMouseDownPosition).Y - offsetFromReferenceOrigin;
// Flip the vertical coordinate space when scrolling downwards
if (scrollingInfo.Direction.Value == ScrollingDirection.Down)
targetPosition = targetPosition - referenceParent.DrawHeight;
float movementDelta = targetPosition - reference.HitObject.Position.Y;
foreach (var b in SelectedBlueprints.OfType<ManiaSelectionBlueprint>())
b.HitObject.Y += movementDelta;
}
private void performDragMovement(DragEvent dragEvent)
{
foreach (var b in SelectedBlueprints)
{
var hitObject = blueprint.HitObject;
var hitObject = b.HitObject;
var objectParent = (HitObjectContainer)hitObject.Parent;
@ -59,11 +92,9 @@ public override void HandleDrag(DragEvent dragEvent)
objectParent.Add(hitObject);
}
adjustColumn(dragEvent);
}
private void adjustColumn(DragEvent dragEvent)
private void performColumnMovement(DragEvent dragEvent)
{
var lastColumn = composer.ColumnAt(dragEvent.ScreenSpaceLastMousePosition);
var currentColumn = composer.ColumnAt(dragEvent.ScreenSpaceMousePosition);

7
osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
View File

@ -3,6 +3,7 @@
using System.Linq;
using osu.Framework.Input.Events;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Screens.Edit.Compose.Components;
@ -10,10 +11,8 @@ namespace osu.Game.Rulesets.Osu.Edit
{
public class OsuSelectionHandler : SelectionHandler
{
public override void HandleDrag(DragEvent dragEvent)
public override void HandleDrag(SelectionBlueprint blueprint, DragEvent dragEvent)
{
base.HandleDrag(dragEvent);
foreach (var h in SelectedHitObjects.OfType<OsuHitObject>())
{
if (h is Spinner)
@ -24,6 +23,8 @@ public override void HandleDrag(DragEvent dragEvent)
h.Position += dragEvent.Delta;
}
base.HandleDrag(blueprint, dragEvent);
}
}
}

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

@ -38,7 +38,7 @@ public abstract class SelectionBlueprint : CompositeDrawable, IStateful<Selectio
/// <summary>
/// Invoked when this <see cref="SelectionBlueprint"/> has requested drag.
/// </summary>
public event Action<DragEvent> DragRequested;
public event Action<SelectionBlueprint, DragEvent> DragRequested;
/// <summary>
/// The <see cref="DrawableHitObject"/> which this <see cref="SelectionBlueprint"/> applies to.
@ -130,7 +130,7 @@ protected override bool OnClick(ClickEvent e)
protected override bool OnDrag(DragEvent e)
{
DragRequested?.Invoke(e);
DragRequested?.Invoke(this, e);
return true;
}

2
osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
View File

@ -180,7 +180,7 @@ private void onBlueprintDeselected(SelectionBlueprint blueprint)
private void onSelectionRequested(SelectionBlueprint blueprint, InputState state) => selectionHandler.HandleSelectionRequested(blueprint, state);
private void onDragRequested(DragEvent dragEvent) => selectionHandler.HandleDrag(dragEvent);
private void onDragRequested(SelectionBlueprint blueprint, DragEvent dragEvent) => selectionHandler.HandleDrag(blueprint, dragEvent);
private class SelectionBlueprintContainer : Container<SelectionBlueprint>
{

4
osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
View File

@ -13,6 +13,7 @@
using osu.Game.Graphics;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Drawables;
using osuTK;
using osuTK.Input;
@ -66,8 +67,9 @@ private void load(OsuColour colours)
/// <summary>
/// Handles the selected <see cref="DrawableHitObject"/>s being dragged.
/// </summary>
/// <param name="blueprint">The <see cref="SelectionBlueprint"/> that received the drag event.</param>
/// <param name="dragEvent">The drag event.</param>
public virtual void HandleDrag(DragEvent dragEvent)
public virtual void HandleDrag(SelectionBlueprint blueprint, DragEvent dragEvent)
{
}