RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid casting by accepting all `Playfield`s but throwing on a bad choice

This commit is contained in:
Dean Herbert 2022-10-11 16:54:41 +09:00
parent 6ab29a62d0
commit f41b79688f
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Rulesets.Catch/Edit/CatchBlueprintContainer.cs
View File

@ -5,7 +5,6 @@
using osu.Game.Rulesets.Catch.Edit.Blueprints;
using osu.Game.Rulesets.Catch.Objects;
using osu.Game.Rulesets.Catch.UI;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Objects;
using osu.Game.Screens.Edit.Compose.Components;
@ -38,6 +37,6 @@ public override HitObjectSelectionBlueprint CreateHitObjectBlueprintFor(HitObjec
return base.CreateHitObjectBlueprintFor(hitObject);
}
protected sealed override DragBox CreateDragBox() => new ScrollingDragBox((CatchPlayfield)Composer.Playfield);
protected sealed override DragBox CreateDragBox() => new ScrollingDragBox(Composer.Playfield);
}
}

3
osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
View File

@ -6,7 +6,6 @@
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Mania.Edit.Blueprints;
using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.Mania.UI;
using osu.Game.Rulesets.Objects;
using osu.Game.Screens.Edit.Compose.Components;
@ -35,6 +34,6 @@ public override HitObjectSelectionBlueprint CreateHitObjectBlueprintFor(HitObjec
protected override SelectionHandler<HitObject> CreateSelectionHandler() => new ManiaSelectionHandler();
protected sealed override DragBox CreateDragBox() => new ScrollingDragBox((ManiaPlayfield)Composer.Playfield);
protected sealed override DragBox CreateDragBox() => new ScrollingDragBox(Composer.Playfield);
}
}

5
osu.Game/Screens/Edit/Compose/Components/ScrollingDragBox.cs
View File

@ -3,6 +3,7 @@
using System;
using osu.Framework.Input.Events;
using osu.Game.Rulesets.UI;
using osu.Game.Rulesets.UI.Scrolling;
namespace osu.Game.Screens.Edit.Compose.Components
@ -20,9 +21,9 @@ public class ScrollingDragBox : DragBox
private readonly ScrollingPlayfield playfield;
public ScrollingDragBox(ScrollingPlayfield playfield)
public ScrollingDragBox(Playfield playfield)
{
this.playfield = playfield;
this.playfield = playfield as ScrollingPlayfield ?? throw new ArgumentException("Playfield must be of type {nameof(ScrollingPlayfield)} to use this class.", nameof(playfield));
}
public override void HandleDrag(MouseButtonEvent e)