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

More removal of "drag"

This commit is contained in:
smoogipoo 2019-10-08 19:24:58 +09:00
parent 8b661e624d
commit c1db11fa06
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,9 +46,9 @@ public abstract class SelectionBlueprint : CompositeDrawable, IStateful<Selectio
public readonly DrawableHitObject HitObject;
/// <summary>
/// The screen-space position of <see cref="HitObject"/> when a drag was started.
/// The screen-space position of <see cref="HitObject"/> prior to handling a movement event.
/// </summary>
public Vector2 ScreenSpaceDragStartPosition { get; private set; }
internal Vector2 ScreenSpaceMovementStartPosition { get; private set; }
protected override bool ShouldBeAlive => (HitObject.IsAlive && HitObject.IsPresent) || State == SelectionState.Selected;
public override bool HandlePositionalInput => ShouldBeAlive;
@ -138,7 +138,7 @@ protected override bool OnClick(ClickEvent e)
protected override bool OnDragStart(DragStartEvent e)
{
ScreenSpaceDragStartPosition = HitObject.ToScreenSpace(HitObject.OriginPosition);
ScreenSpaceMovementStartPosition = HitObject.ToScreenSpace(HitObject.OriginPosition);
return true;
}

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

@ -218,11 +218,9 @@ private void onBlueprintDeselected(SelectionBlueprint blueprint)
private void onDragRequested(SelectionBlueprint blueprint, DragEvent dragEvent)
{
var dragPosition = blueprint.ScreenSpaceDragStartPosition + dragEvent.ScreenSpaceMousePosition - dragEvent.ScreenSpaceMouseDownPosition;
var movePosition = blueprint.ScreenSpaceMovementStartPosition + dragEvent.ScreenSpaceMousePosition - dragEvent.ScreenSpaceMouseDownPosition;
// Todo: Snap dragPosition
selectionHandler.HandleMovement(new MoveSelectionEvent(blueprint, blueprint.ScreenSpaceDragStartPosition, dragPosition));
selectionHandler.HandleMovement(new MoveSelectionEvent(blueprint, blueprint.ScreenSpaceMovementStartPosition, movePosition));
}
protected override void Dispose(bool isDisposing)