sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-03 04:37:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Make more things private

Browse Source
This commit is contained in:
Dean Herbert 2017-12-18 11:13:16 +09:00
parent d6ba53acb3
commit b21c22085d
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,9 +28,9 @@ namespace osu.Game.Screens.Select.Carousel
private Sprite background; private Sprite background;
public Action<BeatmapInfo> StartRequested; private Action<BeatmapInfo> startRequested;
public Action<BeatmapInfo> EditRequested; private Action<BeatmapInfo> editRequested;
public Action<BeatmapInfo> HideRequested; private Action<BeatmapInfo> hideRequested;
private Triangles triangles; private Triangles triangles;
private StarCounter starCounter; private StarCounter starCounter;
@ -46,12 +46,12 @@ namespace osu.Game.Screens.Select.Carousel
{ {
if (songSelect != null) if (songSelect != null)
{ {
StartRequested = songSelect.Start; startRequested = songSelect.Start;
EditRequested = songSelect.Edit; editRequested = songSelect.Edit;
} }
if (manager != null) if (manager != null)
HideRequested = manager.Hide; hideRequested = manager.Hide;
Children = new Drawable[] Children = new Drawable[]
{ {
@ -153,7 +153,7 @@ namespace osu.Game.Screens.Select.Carousel
protected override bool OnClick(InputState state) protected override bool OnClick(InputState state)
{ {
if (Item.State == CarouselItemState.Selected) if (Item.State == CarouselItemState.Selected)
StartRequested?.Invoke(beatmap); startRequested?.Invoke(beatmap);
return base.OnClick(state); return base.OnClick(state);
} }
@ -168,9 +168,9 @@ namespace osu.Game.Screens.Select.Carousel
public MenuItem[] ContextMenuItems => new MenuItem[] public MenuItem[] ContextMenuItems => new MenuItem[]
{ {
new OsuMenuItem("Play", MenuItemType.Highlighted, () => StartRequested?.Invoke(beatmap)), new OsuMenuItem("Play", MenuItemType.Highlighted, () => startRequested?.Invoke(beatmap)),
new OsuMenuItem("Edit", MenuItemType.Standard, () => EditRequested?.Invoke(beatmap)), new OsuMenuItem("Edit", MenuItemType.Standard, () => editRequested?.Invoke(beatmap)),
new OsuMenuItem("Hide", MenuItemType.Destructive, () => HideRequested?.Invoke(beatmap)), new OsuMenuItem("Hide", MenuItemType.Destructive, () => hideRequested?.Invoke(beatmap)),
}; };
} }
} }

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

@ -24,8 +24,8 @@ namespace osu.Game.Screens.Select.Carousel
{ {
public class DrawableCarouselBeatmapSet : DrawableCarouselItem, IHasContextMenu public class DrawableCarouselBeatmapSet : DrawableCarouselItem, IHasContextMenu
{ {
public Action<BeatmapSetInfo> DeleteRequested; private Action<BeatmapSetInfo> deleteRequested;
public Action<BeatmapSetInfo> RestoreHiddenRequested; private Action<BeatmapSetInfo> restoreHiddenRequested;
private readonly BeatmapSetInfo beatmapSet; private readonly BeatmapSetInfo beatmapSet;
@ -43,8 +43,8 @@ namespace osu.Game.Screens.Select.Carousel
if (localisation == null) if (localisation == null)
throw new ArgumentNullException(nameof(localisation)); throw new ArgumentNullException(nameof(localisation));
RestoreHiddenRequested = s => s.Beatmaps.ForEach(manager.Restore); restoreHiddenRequested = s => s.Beatmaps.ForEach(manager.Restore);
DeleteRequested = manager.Delete; deleteRequested = manager.Delete;
Children = new Drawable[] Children = new Drawable[]
{ {
@ -97,9 +97,9 @@ namespace osu.Game.Screens.Select.Carousel
items.Add(new OsuMenuItem("Expand", MenuItemType.Highlighted, () => Item.State.Value = CarouselItemState.Selected)); items.Add(new OsuMenuItem("Expand", MenuItemType.Highlighted, () => Item.State.Value = CarouselItemState.Selected));
if (beatmapSet.Beatmaps.Any(b => b.Hidden)) if (beatmapSet.Beatmaps.Any(b => b.Hidden))
items.Add(new OsuMenuItem("Restore all hidden", MenuItemType.Standard, () => RestoreHiddenRequested?.Invoke(beatmapSet))); items.Add(new OsuMenuItem("Restore all hidden", MenuItemType.Standard, () => restoreHiddenRequested?.Invoke(beatmapSet)));
items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => DeleteRequested?.Invoke(beatmapSet))); items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => deleteRequested?.Invoke(beatmapSet)));
return items.ToArray(); return items.ToArray();
} }