h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-22 01:23:24 +08:00
Code Issues Releases Wiki Activity

Delete -> Hide

Browse Source
This commit is contained in:
Dean Herbert 2017-09-04 07:59:32 +09:00
parent 19ad5d5328
commit dd26c80837
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Beatmaps.Drawables
public Action<BeatmapSetInfo> RestoreHiddenRequested; public Action<BeatmapSetInfo> RestoreHiddenRequested;
public Action<BeatmapInfo> DeleteDifficultyRequested; public Action<BeatmapInfo> HideDifficultyRequested;
public BeatmapSetHeader Header; public BeatmapSetHeader Header;
@ -82,7 +82,7 @@ namespace osu.Game.Beatmaps.Drawables
{ {
Alpha = 0, Alpha = 0,
GainedSelection = panelGainedSelection, GainedSelection = panelGainedSelection,
DeleteRequested = p => DeleteDifficultyRequested?.Invoke(p), HideRequested = p => HideDifficultyRequested?.Invoke(p),
StartRequested = p => { StartRequested?.Invoke(p.Beatmap); }, StartRequested = p => { StartRequested?.Invoke(p.Beatmap); },
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
}).ToList(); }).ToList();

4
osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Beatmaps.Drawables
public Action<BeatmapPanel> GainedSelection; public Action<BeatmapPanel> GainedSelection;
public Action<BeatmapPanel> StartRequested; public Action<BeatmapPanel> StartRequested;
public Action<BeatmapPanel> EditRequested; public Action<BeatmapPanel> EditRequested;
public Action<BeatmapInfo> DeleteRequested; public Action<BeatmapInfo> HideRequested;
private readonly Triangles triangles; private readonly Triangles triangles;
private readonly StarCounter starCounter; private readonly StarCounter starCounter;
@ -158,7 +158,7 @@ namespace osu.Game.Beatmaps.Drawables
{ {
new OsuMenuItem("Play", MenuItemType.Highlighted, () => StartRequested?.Invoke(this)), new OsuMenuItem("Play", MenuItemType.Highlighted, () => StartRequested?.Invoke(this)),
new OsuMenuItem("Edit", MenuItemType.Standard, () => EditRequested?.Invoke(this)), new OsuMenuItem("Edit", MenuItemType.Standard, () => EditRequested?.Invoke(this)),
new OsuMenuItem("Hide", MenuItemType.Destructive, () => DeleteRequested?.Invoke(Beatmap)), new OsuMenuItem("Hide", MenuItemType.Destructive, () => HideRequested?.Invoke(Beatmap)),
}; };
} }
} }

4
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -171,7 +171,7 @@ namespace osu.Game.Screens.Select
public Action<BeatmapSetInfo> RestoreRequested; public Action<BeatmapSetInfo> RestoreRequested;
public Action<BeatmapInfo> DeleteDifficultyRequested; public Action<BeatmapInfo> HideDifficultyRequested;
public void SelectNext(int direction = 1, bool skipDifficulties = true) public void SelectNext(int direction = 1, bool skipDifficulties = true)
{ {
@ -341,7 +341,7 @@ namespace osu.Game.Screens.Select
StartRequested = b => StartRequested?.Invoke(), StartRequested = b => StartRequested?.Invoke(),
DeleteRequested = b => DeleteRequested?.Invoke(b), DeleteRequested = b => DeleteRequested?.Invoke(b),
RestoreHiddenRequested = s => RestoreRequested?.Invoke(s), RestoreHiddenRequested = s => RestoreRequested?.Invoke(s),
DeleteDifficultyRequested = b => DeleteDifficultyRequested?.Invoke(b), HideDifficultyRequested = b => HideDifficultyRequested?.Invoke(b),
State = BeatmapGroupState.Collapsed State = BeatmapGroupState.Collapsed
}; };
} }

2
osu.Game/Screens/Select/SongSelect.cs
View File

@ -108,7 +108,7 @@ namespace osu.Game.Screens.Select
BeatmapsChanged = carouselBeatmapsLoaded, BeatmapsChanged = carouselBeatmapsLoaded,
DeleteRequested = b => promptDelete(b), DeleteRequested = b => promptDelete(b),
RestoreRequested = s => { foreach (var b in s.Beatmaps) manager.Restore(b); }, RestoreRequested = s => { foreach (var b in s.Beatmaps) manager.Restore(b); },
DeleteDifficultyRequested = b => manager.Hide(b), HideDifficultyRequested = b => manager.Hide(b),
StartRequested = () => carouselRaisedStart(), StartRequested = () => carouselRaisedStart(),
}); });
Add(FilterControl = new FilterControl Add(FilterControl = new FilterControl