h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 16:47:24 +08:00
Code Issues Releases Wiki Activity

Move selection box control internal events to drag handles

Browse Source
This commit is contained in:
Salman Ahmed 2021-05-04 06:37:18 +03:00
parent fd7a6b3a7c
commit 5f33c3514e
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
View File

@ -22,9 +22,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
public event Action OperationStarted; public event Action OperationStarted;
public event Action OperationEnded; public event Action OperationEnded;
internal event Action HoverGained;
internal event Action HoverLost;
private Circle circle; private Circle circle;
/// <summary> /// <summary>
@ -62,14 +59,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
protected override bool OnHover(HoverEvent e) protected override bool OnHover(HoverEvent e)
{ {
UpdateHoverState(); UpdateHoverState();
HoverGained?.Invoke();
return true; return true;
} }
protected override void OnHoverLost(HoverLostEvent e) protected override void OnHoverLost(HoverLostEvent e)
{ {
base.OnHoverLost(e);
HoverLost?.Invoke();
UpdateHoverState(); UpdateHoverState();
} }
@ -89,7 +83,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
{ {
HandlingMouse = false; HandlingMouse = false;
UpdateHoverState(); UpdateHoverState();
base.OnMouseUp(e);
} }
protected virtual void UpdateHoverState() protected virtual void UpdateHoverState()

20
osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
View File

@ -29,5 +29,25 @@ namespace osu.Game.Screens.Edit.Compose.Components
UpdateHoverState(); UpdateHoverState();
base.OnDragEnd(e); base.OnDragEnd(e);
} }
#region Internal events for SelectionBoxDragHandleContainer
internal event Action HoverGained;
internal event Action HoverLost;
protected override bool OnHover(HoverEvent e)
{
bool result = base.OnHover(e);
HoverGained?.Invoke();
return result;
}
protected override void OnHoverLost(HoverLostEvent e)
{
base.OnHoverLost(e);
HoverLost?.Invoke();
}
#endregion
} }
} }