h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-23 04:02:55 +08:00
Code Issues Releases Wiki Activity

Fix selection changing when clicking overlapping hitobjects

Browse Source
This commit is contained in:
Dean Herbert 2018-04-06 11:22:36 +09:00
parent 24b9a8c983
commit 32e8d93596
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game/Screens/Edit/Screens/Compose/Layers/MaskContainer.cs
View File

@ -86,8 +86,18 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Layers
/// </summary> /// </summary>
public void DeselectAll() => aliveMasks.ToList().ForEach(m => m.Deselect()); public void DeselectAll() => aliveMasks.ToList().ForEach(m => m.Deselect());
private void onMaskSelected(HitObjectMask mask) => MaskSelected?.Invoke(mask); private void onMaskSelected(HitObjectMask mask)
private void onMaskDeselected(HitObjectMask mask) => MaskDeselected?.Invoke(mask); {
MaskSelected?.Invoke(mask);
ChangeChildDepth(mask, 1);
}
private void onMaskDeselected(HitObjectMask mask)
{
MaskDeselected?.Invoke(mask);
ChangeChildDepth(mask, 0);
}
private void onSelectionRequested(HitObjectMask mask, InputState state) => MaskSelectionRequested?.Invoke(mask, state); private void onSelectionRequested(HitObjectMask mask, InputState state) => MaskSelectionRequested?.Invoke(mask, state);
private void onDragRequested(HitObjectMask mask, InputState state) => MaskDragRequested?.Invoke(mask, state); private void onDragRequested(HitObjectMask mask, InputState state) => MaskDragRequested?.Invoke(mask, state);
@ -100,6 +110,11 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Layers
public int Compare(HitObjectMask x, HitObjectMask y) public int Compare(HitObjectMask x, HitObjectMask y)
{ {
// dpeth is used to denote selected status (we always want selected masks to handle input first).
int d = x.Depth.CompareTo(y.Depth);
if (d != 0)
return d;
// Put earlier hitobjects towards the end of the list, so they handle input first // Put earlier hitobjects towards the end of the list, so they handle input first
int i = y.HitObject.HitObject.StartTime.CompareTo(x.HitObject.HitObject.StartTime); int i = y.HitObject.HitObject.StartTime.CompareTo(x.HitObject.HitObject.StartTime);
return i == 0 ? CompareReverseChildID(x, y) : i; return i == 0 ? CompareReverseChildID(x, y) : i;

1
osu.Game/Screens/Edit/Screens/Compose/Layers/MaskSelection.cs
View File

@ -3,7 +3,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;