h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-21 06:42:54 +08:00
Code Issues Releases Wiki Activity

Properly modify comment visual state on deletion

Browse Source
This commit is contained in:
ansel 2022-10-08 18:41:08 +03:00
parent 6e82ffbc6f
commit b697200460
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
osu.Game/Overlays/Comments/DrawableComment.cs
View File

@ -47,6 +47,11 @@ namespace osu.Game.Overlays.Comments
private int currentPage; private int currentPage;
/// <summary>
/// Local field for tracking comment state. Initialized from Comment.IsDeleted, may change when deleting was requested by user.
/// </summary>
public bool WasDeleted { get; protected set; }
private FillFlowContainer childCommentsVisibilityContainer = null!; private FillFlowContainer childCommentsVisibilityContainer = null!;
private FillFlowContainer childCommentsContainer = null!; private FillFlowContainer childCommentsContainer = null!;
private LoadRepliesButton loadRepliesButton = null!; private LoadRepliesButton loadRepliesButton = null!;
@ -56,6 +61,9 @@ namespace osu.Game.Overlays.Comments
private LinkFlowContainer actionsContainer = null!; private LinkFlowContainer actionsContainer = null!;
private LoadingSpinner actionsLoading = null!; private LoadingSpinner actionsLoading = null!;
private DeletedCommentsCounter deletedCommentsCounter = null!; private DeletedCommentsCounter deletedCommentsCounter = null!;
private OsuSpriteText deletedLabel = null!;
private GridContainer content = null!;
private VotePill votePill = null!;
[Resolved(canBeNull: true)] [Resolved(canBeNull: true)]
private IDialogOverlay? dialogOverlay { get; set; } private IDialogOverlay? dialogOverlay { get; set; }
@ -74,8 +82,6 @@ namespace osu.Game.Overlays.Comments
LinkFlowContainer username; LinkFlowContainer username;
FillFlowContainer info; FillFlowContainer info;
CommentMarkdownContainer message; CommentMarkdownContainer message;
GridContainer content;
VotePill votePill;
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;
@ -158,9 +164,9 @@ namespace osu.Game.Overlays.Comments
}, },
Comment.Pinned ? new PinnedCommentNotice() : Empty(), Comment.Pinned ? new PinnedCommentNotice() : Empty(),
new ParentUsername(Comment), new ParentUsername(Comment),
new OsuSpriteText deletedLabel = new OsuSpriteText
{ {
Alpha = Comment.IsDeleted ? 1 : 0, Alpha = 0f,
Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold), Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold),
Text = CommentsStrings.Deleted Text = CommentsStrings.Deleted
} }
@ -312,11 +318,9 @@ namespace osu.Game.Overlays.Comments
if (Comment.HasMessage) if (Comment.HasMessage)
message.Text = Comment.Message; message.Text = Comment.Message;
if (Comment.IsDeleted) WasDeleted = Comment.IsDeleted;
{ if (WasDeleted)
content.FadeColour(OsuColour.Gray(0.5f)); makeDeleted();
votePill.Hide();
}
if (Comment.UserId.HasValue && Comment.UserId.Value == api.LocalUser.Value.Id) if (Comment.UserId.HasValue && Comment.UserId.Value == api.LocalUser.Value.Id)
{ {
@ -352,6 +356,17 @@ namespace osu.Game.Overlays.Comments
}; };
} }
/// <summary>
/// Transforms some comment's components to show it as deleted. Invoked both from loading and deleting.
/// </summary>
private void makeDeleted()
{
deletedLabel.Alpha = 1f;
content.FadeColour(OsuColour.Gray(0.5f));
votePill.Hide();
actionsContainer.Expire();
}
/// <summary> /// <summary>
/// Invokes comment deletion with confirmation. /// Invokes comment deletion with confirmation.
/// </summary> /// </summary>
@ -374,10 +389,10 @@ namespace osu.Game.Overlays.Comments
request.Success += _ => Schedule(() => request.Success += _ => Schedule(() =>
{ {
actionsLoading.Hide(); actionsLoading.Hide();
AutoSizeAxes = Axes.None; makeDeleted();
Masking = true; WasDeleted = true;
this.ResizeHeightTo(0, 1000, Easing.Out); if (!ShowDeleted.Value)
this.FadeOut(1000, Easing.Out).Expire(); Hide();
}); });
request.Failure += _ => Schedule(() => request.Failure += _ => Schedule(() =>
{ {
@ -391,7 +406,7 @@ namespace osu.Game.Overlays.Comments
{ {
ShowDeleted.BindValueChanged(show => ShowDeleted.BindValueChanged(show =>
{ {
if (Comment.IsDeleted) if (WasDeleted)
this.FadeTo(show.NewValue ? 1 : 0); this.FadeTo(show.NewValue ? 1 : 0);
}, true); }, true);
childrenExpanded.BindValueChanged(expanded => childCommentsVisibilityContainer.FadeTo(expanded.NewValue ? 1 : 0), true); childrenExpanded.BindValueChanged(expanded => childCommentsVisibilityContainer.FadeTo(expanded.NewValue ? 1 : 0), true);