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

Fix SelectionBox buttons freezing when button is triggered via key event

Browse Source
This commit is contained in:
Marvin Schürz 2024-10-10 20:14:11 +02:00
parent cab97a96ab
commit 9cc6ee2ebc
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,13 +150,25 @@ namespace osu.Game.Screens.Edit.Compose.Components
switch (e.Key) switch (e.Key)
{ {
case Key.G: case Key.G:
return CanReverse && reverseButton?.TriggerClick() == true; if (!CanReverse || reverseButton == null)
return false;
reverseButton.TriggerAction();
return true;
case Key.Comma: case Key.Comma:
return canRotate.Value && rotateCounterClockwiseButton?.TriggerClick() == true; if (!canRotate.Value || rotateCounterClockwiseButton == null)
return false;
rotateCounterClockwiseButton.TriggerAction();
return true;
case Key.Period: case Key.Period:
return canRotate.Value && rotateClockwiseButton?.TriggerClick() == true; if (!canRotate.Value || rotateClockwiseButton == null)
return false;
rotateClockwiseButton.TriggerAction();
return true;
} }
return base.OnKeyDown(e); return base.OnKeyDown(e);
@ -285,7 +297,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
Action = action Action = action
}; };
button.OperationStarted += freezeButtonPosition; button.Clicked += freezeButtonPosition;
button.HoverLost += unfreezeButtonPosition; button.HoverLost += unfreezeButtonPosition;
button.OperationStarted += operationStarted; button.OperationStarted += operationStarted;

16
osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
View File

@ -21,6 +21,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
public Action? Action; public Action? Action;
public event Action? Clicked;
public event Action? HoverLost; public event Action? HoverLost;
public SelectionBoxButton(IconUsage iconUsage, string tooltip) public SelectionBoxButton(IconUsage iconUsage, string tooltip)
@ -51,9 +53,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
{ {
Circle.FlashColour(Colours.GrayF, 300); Circle.FlashColour(Colours.GrayF, 300);
TriggerOperationStarted(); Clicked?.Invoke();
Action?.Invoke();
TriggerOperationEnded(); TriggerAction();
return true; return true;
} }
@ -71,5 +74,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
} }
public LocalisableString TooltipText { get; } public LocalisableString TooltipText { get; }
internal void TriggerAction()
{
TriggerOperationStarted();
Action?.Invoke();
TriggerOperationEnded();
}
} }
} }