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

Move drawables loading to AppendComments()

Browse Source
This commit is contained in:
Andrei Zavatski 2020-02-27 20:00:41 +03:00
parent 62b4fa602f
commit e2c495e8c2
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
osu.Game/Overlays/Comments/CommentsContainer.cs
View File

@ -174,6 +174,8 @@ namespace osu.Game.Overlays.Comments
protected void OnSuccess(CommentBundle response) protected void OnSuccess(CommentBundle response)
{ {
CommentCounter.Current.Value = response.Total;
if (!response.Comments.Any()) if (!response.Comments.Any())
{ {
content.Add(new NoCommentsPlaceholder()); content.Add(new NoCommentsPlaceholder());
@ -181,35 +183,14 @@ namespace osu.Game.Overlays.Comments
return; return;
} }
var topLevelComments = AppendComments(response); AppendComments(response);
LoadComponentsAsync(topLevelComments, loaded =>
{
content.AddRange(loaded);
deletedCommentsCounter.Count.Value += response.Comments.Count(c => c.IsDeleted && c.IsTopLevel);
CommentCounter.Current.Value = response.Total;
if (response.HasMore)
{
int loadedTopLevelComments = 0;
content.Children.OfType<DrawableComment>().ForEach(p => loadedTopLevelComments++);
moreButton.Current.Value = response.TopLevelCount - loadedTopLevelComments;
moreButton.IsLoading = false;
}
else
{
moreButton.Hide();
}
}, (loadCancellation = new CancellationTokenSource()).Token);
} }
/// <summary> /// <summary>
/// Appends retrieved comments to the subtree rooted of comments in this page. /// Appends retrieved comments to the subtree rooted of comments in this page.
/// </summary> /// </summary>
/// <param name="bundle">The bundle of comments to add.</param> /// <param name="bundle">The bundle of comments to add.</param>
protected List<DrawableComment> AppendComments([NotNull] CommentBundle bundle) protected void AppendComments([NotNull] CommentBundle bundle)
{ {
var topLevelComments = new List<DrawableComment>(); var topLevelComments = new List<DrawableComment>();
var orphaned = new List<Comment>(); var orphaned = new List<Comment>();
@ -227,7 +208,28 @@ namespace osu.Game.Overlays.Comments
foreach (var o in orphaned) foreach (var o in orphaned)
addNewComment(o); addNewComment(o);
return topLevelComments; if (topLevelComments.Any())
{
LoadComponentsAsync(topLevelComments, loaded =>
{
content.AddRange(loaded);
deletedCommentsCounter.Count.Value += topLevelComments.Select(d => d.Comment).Count(c => c.IsDeleted && c.IsTopLevel);
if (bundle.HasMore)
{
int loadedTopLevelComments = 0;
content.Children.OfType<DrawableComment>().ForEach(p => loadedTopLevelComments++);
moreButton.Current.Value = bundle.TopLevelCount - loadedTopLevelComments;
moreButton.IsLoading = false;
}
else
{
moreButton.Hide();
}
}, (loadCancellation = new CancellationTokenSource()).Token);
}
void addNewComment(Comment comment) void addNewComment(Comment comment)
{ {