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

Invert naming of exposed actions

Browse Source
This commit is contained in:
Dan Balasescu 2021-12-09 01:52:59 +09:00
parent 273042aa16
commit 23332995d1
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs
View File

@ -26,12 +26,12 @@ namespace osu.Game.Screens.OnlinePlay
/// <summary>
/// Invoked when an item is requested to be deleted.
/// </summary>
public Action<PlaylistItem> DeletionRequested;
public Action<PlaylistItem> RequestDeletion;
/// <summary>
/// Invoked when an item requests its results to be shown.
/// </summary>
public Action<PlaylistItem> ShowResultsRequested;
public Action<PlaylistItem> RequestResults;
private bool allowReordering;
@ -54,7 +54,7 @@ namespace osu.Game.Screens.OnlinePlay
/// <summary>
/// Whether to allow deleting items from the playlist.
/// If <c>true</c>, requests to delete items may be satisfied via <see cref="DeletionRequested"/>.
/// If <c>true</c>, requests to delete items may be satisfied via <see cref="RequestDeletion"/>.
/// </summary>
public bool AllowDeletion
{
@ -90,7 +90,7 @@ namespace osu.Game.Screens.OnlinePlay
/// <summary>
/// Whether to allow items to request their results to be shown.
/// If <c>true</c>, requests to show the results may be satisfied via <see cref="ShowResultsRequested"/>.
/// If <c>true</c>, requests to show the results may be satisfied via <see cref="RequestResults"/>.
/// </summary>
public bool AllowShowingResults
{
@ -134,13 +134,13 @@ namespace osu.Game.Screens.OnlinePlay
protected sealed override OsuRearrangeableListItem<PlaylistItem> CreateOsuDrawable(PlaylistItem item) => CreateDrawablePlaylistItem(item).With(d =>
{
d.SelectedItem.BindTarget = SelectedItem;
d.RequestDeletion = i => DeletionRequested?.Invoke(i);
d.RequestDeletion = i => RequestDeletion?.Invoke(i);
d.AllowReordering = AllowReordering;
d.AllowDeletion = AllowDeletion;
d.AllowSelection = AllowSelection;
d.AllowShowingResults = AllowShowingResults;
d.ShowItemOwner = ShowItemOwners;
d.ShowResultsRequested = i => ShowResultsRequested?.Invoke(i);
d.RequestResults = i => RequestResults?.Invoke(i);
});
protected virtual DrawableRoomPlaylistItem CreateDrawablePlaylistItem(PlaylistItem item) => new DrawableRoomPlaylistItem(item);

4
osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
View File

@ -48,7 +48,7 @@ namespace osu.Game.Screens.OnlinePlay
/// <summary>
/// Invoked when this item requests its results to be shown.
/// </summary>
public Action<PlaylistItem> ShowResultsRequested;
public Action<PlaylistItem> RequestResults;
/// <summary>
/// The currently-selected item, used to show a border around this item.
@ -410,7 +410,7 @@ namespace osu.Game.Screens.OnlinePlay
{
showResultsButton = new ShowResultsButton
{
Action = () => ShowResultsRequested?.Invoke(Item),
Action = () => RequestResults?.Invoke(Item),
Alpha = AllowShowingResults ? 1 : 0,
},
Item.Beatmap.Value == null ? Empty() : new PlaylistDownloadButton(Item),

2
osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsPlaylist.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
AllowReordering = true;
AllowDeletion = true;
DeletionRequested = item =>
RequestDeletion = item =>
{
var nextItem = Items.GetNext(item);

2
osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
View File

@ -95,7 +95,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
SelectedItem = { BindTarget = SelectedItem },
AllowSelection = true,
AllowShowingResults = true,
ShowResultsRequested = item =>
RequestResults = item =>
{
Debug.Assert(RoomId.Value != null);
ParentScreen?.Push(new PlaylistsResultsScreen(null, RoomId.Value.Value, item, false));