sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-01 11:47:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23509 from peppy/editor-slider-placement-tool-change

Browse Source 
Force placement of in-progress object when changing tools in the editor
This commit is contained in:
Bartłomiej Dach 2023-05-14 18:48:43 +02:00 committed by GitHub
commit 265096bed7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game.Tests/Visual/Editing/TestScenePlacementBlueprint.cs
View File

@ -79,5 +79,28 @@ namespace osu.Game.Tests.Visual.Editing
AddAssert("no active placement", () => this.ChildrenOfType<ComposeBlueprintContainer>().Single().CurrentPlacement.PlacementActive, AddAssert("no active placement", () => this.ChildrenOfType<ComposeBlueprintContainer>().Single().CurrentPlacement.PlacementActive,
() => Is.EqualTo(PlacementBlueprint.PlacementState.Waiting)); () => Is.EqualTo(PlacementBlueprint.PlacementState.Waiting));
} }
[Test]
public void TestCommitPlacementViaToolChange()
{
Playfield playfield = null!;
AddStep("select slider placement tool", () => InputManager.Key(Key.Number3));
AddStep("move mouse to top left of playfield", () =>
{
playfield = this.ChildrenOfType<Playfield>().Single();
var location = (3 * playfield.ScreenSpaceDrawQuad.TopLeft + playfield.ScreenSpaceDrawQuad.BottomRight) / 4;
InputManager.MoveMouseTo(location);
});
AddStep("begin placement", () => InputManager.Click(MouseButton.Left));
AddStep("move mouse to bottom right of playfield", () =>
{
var location = (playfield.ScreenSpaceDrawQuad.TopLeft + 3 * playfield.ScreenSpaceDrawQuad.BottomRight) / 4;
InputManager.MoveMouseTo(location);
});
AddStep("change tool to circle", () => InputManager.Key(Key.Number2));
AddAssert("slider placed", () => EditorBeatmap.HitObjects.Count, () => Is.EqualTo(1));
}
} }
} }

15
osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
View File

@ -317,12 +317,16 @@ namespace osu.Game.Screens.Edit.Compose.Components
} }
} }
private void commitIfPlacementActive()
{
CurrentPlacement?.EndPlacement(CurrentPlacement.PlacementActive == PlacementBlueprint.PlacementState.Active);
removePlacement();
}
private void removePlacement() private void removePlacement()
{ {
if (CurrentPlacement == null) return; CurrentPlacement?.EndPlacement(false);
CurrentPlacement?.Expire();
CurrentPlacement.EndPlacement(false);
CurrentPlacement.Expire();
CurrentPlacement = null; CurrentPlacement = null;
} }
@ -342,7 +346,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
currentTool = value; currentTool = value;
refreshTool(); // As per stable editor, when changing tools, we should forcefully commit any pending placement.
commitIfPlacementActive();
} }
} }
} }