sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 22:56:36 +09:00
Code Issues Packages Projects Releases Wiki Activity

Use [Resolved] wherever possible

Browse Source
This commit is contained in:
recapitalverb
2020-02-14 20:14:00 +07:00
parent 6d87d22a84
commit c753cb46c5
35 changed files with 128 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
View File

@ -37,7 +37,8 @@ namespace osu.Game.Screens.Select.Carousel
private Triangles triangles;
private StarCounter starCounter;
private BeatmapSetOverlay beatmapOverlay;
[Resolved]
private BeatmapSetOverlay beatmapOverlay { get; set; }
public DrawableCarouselBeatmap(CarouselBeatmap panel)
: base(panel)
@ -47,10 +48,8 @@ namespace osu.Game.Screens.Select.Carousel
}
[BackgroundDependencyLoader(true)]
private void load(SongSelect songSelect, BeatmapManager manager, BeatmapSetOverlay beatmapOverlay)
private void load(SongSelect songSelect, BeatmapManager manager)
{
this.beatmapOverlay = beatmapOverlay;
if (songSelect != null)
{
startRequested = b => songSelect.FinaliseSelection(b);

6
osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
View File

@ -30,7 +30,8 @@ namespace osu.Game.Screens.Select.Carousel
private Action<BeatmapSetInfo> restoreHiddenRequested;
private Action<int> viewDetails;
private DialogOverlay dialogOverlay;
[Resolved]
private DialogOverlay dialogOverlay { get; set; }
private readonly BeatmapSetInfo beatmapSet;
public DrawableCarouselBeatmapSet(CarouselBeatmapSet set)
@ -40,10 +41,9 @@ namespace osu.Game.Screens.Select.Carousel
}
[BackgroundDependencyLoader(true)]
private void load(BeatmapManager manager, BeatmapSetOverlay beatmapOverlay, DialogOverlay overlay)
private void load(BeatmapManager manager, BeatmapSetOverlay beatmapOverlay)
{
restoreHiddenRequested = s => s.Beatmaps.ForEach(manager.Restore);
dialogOverlay = overlay;
if (beatmapOverlay != null)
viewDetails = beatmapOverlay.FetchAndShowBeatmapSet;