sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 15:16:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix items jumping between two indices in the edge case, use a linear search for now.

Browse Source
This commit is contained in:
smoogipooo
2017-09-04 11:03:04 +09:00
parent c72a9b1301
commit 9078444a62
1 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
osu.Game/Overlays/Music/PlaylistItem.cs
View File

@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
@ -150,9 +151,6 @@ namespace osu.Game.Overlays.Music
{
private readonly FillFlowContainer<PlaylistItem> playlist;
private const int line_height = 22;
private const int rearrange_buffer = 3;
public PlaylistItemHandle(FillFlowContainer<PlaylistItem> playlist)
{
this.playlist = playlist;
@ -169,7 +167,23 @@ namespace osu.Game.Overlays.Music
protected override bool OnDrag(InputState state)
{
int src = (int)Parent.Depth;
int dst = getIndex(state.Mouse.Position.Y + Parent.Position.Y);
var matchingItem = playlist.Children.LastOrDefault(c => c.Position.Y < state.Mouse.Position.Y + Parent.Position.Y);
if (matchingItem == null)
return true;
int dst = (int)matchingItem.Depth;
// Due to the position predicate above, there is an edge case to consider when an item is moved upwards:
// At the point where the two items cross there will be two items sharing the same condition, and the items will jump back
// and forth between the two positions because of this. This is accentuated if the items span differing line heights.
// The easiest way to avoid this is to ensure the movement direction matches the expected mouse delta
if (state.Mouse.Delta.Y <= 0 && dst > src)
return true;
if (state.Mouse.Delta.Y >= 0 && dst < src)
return true;
if (src == dst)
return true;
@ -188,29 +202,6 @@ namespace osu.Game.Overlays.Music
playlist.ChangeChildDepth(Parent as PlaylistItem, dst);
return true;
}
private int getIndex(float position) {
IReadOnlyList<PlaylistItem> items = playlist.Children;
// Binary Search without matching exact
int min = 0;
int max = items.Count - 1;
while (min <= max)
{
int m = (min + max) / 2;
if (items[m].Y < position)
min = m + 1;
else if (items[m].Y > position)
max = m - 1;
}
int index = Math.Max(0, min - 1);
// Only move if mouse falls within buffer
if (position - items[index].Y > rearrange_buffer && position - items[index].Y < line_height - rearrange_buffer) {
return (int)items[index].Depth;
}
return (int)Parent.Depth;
}
}
}
}