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

Fix selection box wandering off into the distance

Browse Source
This commit is contained in:
Leon Gebler 2020-10-26 18:03:04 +01:00
parent 19e58dc4fc
commit 704f8cc4f2
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
View File

@ -9,6 +9,7 @@ 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.Framework.Utils;
using osu.Game.Rulesets.Edit; using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts; using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
@ -107,7 +108,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
OnDragHandled = handleScrollViaDrag OnDragHandled = handleScrollViaDrag
}; };
protected override DragBox CreateDragBox(Action<RectangleF> performSelect) => new TimelineDragBox(performSelect); protected override DragBox CreateDragBox(Action<RectangleF> performSelect) => new TimelineDragBox(performSelect, this);
private void handleScrollViaDrag(DragEvent e) private void handleScrollViaDrag(DragEvent e)
{ {
@ -138,11 +139,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
private class TimelineDragBox : DragBox private class TimelineDragBox : DragBox
{ {
private Vector2 lastMouseDown; private Vector2 lastMouseDown;
private float? lastZoom;
private float localMouseDown; private float localMouseDown;
public TimelineDragBox(Action<RectangleF> performSelect) private readonly TimelineBlueprintContainer parent;
public TimelineDragBox(Action<RectangleF> performSelect, TimelineBlueprintContainer parent)
: base(performSelect) : base(performSelect)
{ {
this.parent = parent;
} }
protected override Drawable CreateBox() => new Box protected override Drawable CreateBox() => new Box
@ -158,8 +163,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
{ {
lastMouseDown = e.ScreenSpaceMouseDownPosition; lastMouseDown = e.ScreenSpaceMouseDownPosition;
localMouseDown = e.MouseDownPosition.X; localMouseDown = e.MouseDownPosition.X;
lastZoom = null;
} }
//Zooming the timeline shifts the coordinate system this compensates for this shift
float zoomCorrection = lastZoom.HasValue ? (parent.timeline.Zoom / lastZoom.Value) : 1;
localMouseDown *= zoomCorrection;
lastZoom = parent.timeline.Zoom;
float selection1 = localMouseDown; float selection1 = localMouseDown;
float selection2 = e.MousePosition.X; float selection2 = e.MousePosition.X;