h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 09:07:25 +08:00
Code Issues Releases Wiki Activity

Only store native position instead of input state.

Browse Source
This commit is contained in:
smoogipooo 2017-09-05 10:37:49 +09:00
parent f76cecc704
commit 1904b5edfe
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Overlays/Music/PlaylistList.cs
View File

@ -125,19 +125,19 @@ namespace osu.Game.Overlays.Music
public BeatmapSetInfo NextSet => (items.SkipWhile(i => !i.Selected).Skip(1).FirstOrDefault() ?? items.FirstOrDefault())?.BeatmapSetInfo; public BeatmapSetInfo NextSet => (items.SkipWhile(i => !i.Selected).Skip(1).FirstOrDefault() ?? items.FirstOrDefault())?.BeatmapSetInfo;
public BeatmapSetInfo PreviousSet => (items.TakeWhile(i => !i.Selected).LastOrDefault() ?? items.LastOrDefault())?.BeatmapSetInfo; public BeatmapSetInfo PreviousSet => (items.TakeWhile(i => !i.Selected).LastOrDefault() ?? items.LastOrDefault())?.BeatmapSetInfo;
private InputState dragInputState; private Vector2 nativeDragPosition;
private PlaylistItem draggedItem; private PlaylistItem draggedItem;
protected override bool OnDragStart(InputState state) protected override bool OnDragStart(InputState state)
{ {
dragInputState = state; nativeDragPosition = state.Mouse.NativeState.Position;
draggedItem = items.FirstOrDefault(d => d.IsDraggable); draggedItem = items.FirstOrDefault(d => d.IsDraggable);
return draggedItem != null || base.OnDragStart(state); return draggedItem != null || base.OnDragStart(state);
} }
protected override bool OnDrag(InputState state) protected override bool OnDrag(InputState state)
{ {
dragInputState = state; nativeDragPosition = state.Mouse.NativeState.Position;
if (draggedItem == null) if (draggedItem == null)
return base.OnDrag(state); return base.OnDrag(state);
return true; return true;
@ -145,7 +145,7 @@ namespace osu.Game.Overlays.Music
protected override bool OnDragEnd(InputState state) protected override bool OnDragEnd(InputState state)
{ {
dragInputState = state; nativeDragPosition = state.Mouse.NativeState.Position;
var handled = draggedItem != null || base.OnDragEnd(state); var handled = draggedItem != null || base.OnDragEnd(state);
draggedItem = null; draggedItem = null;
@ -169,7 +169,7 @@ namespace osu.Game.Overlays.Music
const double max_power = 50; const double max_power = 50;
const double exp_base = 1.05; const double exp_base = 1.05;
var localPos = ToLocalSpace(dragInputState.Mouse.NativeState.Position); var localPos = ToLocalSpace(nativeDragPosition);
if (localPos.Y < start_offset) if (localPos.Y < start_offset)
{ {
@ -191,7 +191,7 @@ namespace osu.Game.Overlays.Music
private void updateDragPosition() private void updateDragPosition()
{ {
var itemsPos = items.ToLocalSpace(dragInputState.Mouse.NativeState.Position); var itemsPos = items.ToLocalSpace(nativeDragPosition);
int srcIndex = (int)draggedItem.Depth; int srcIndex = (int)draggedItem.Depth;