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

Better use of loading animation

Browse Source
This commit is contained in:
Andrei Zavatski 2019-08-27 03:53:16 +03:00
parent 8d30c35104
commit cb81d1dd2f
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Overlays/SocialOverlay.cs
View File

@ -103,7 +103,6 @@ namespace osu.Game.Overlays
Users = null; Users = null;
clearPanels(); clearPanels();
loading.Hide();
getUsersRequest?.Cancel(); getUsersRequest?.Cancel();
if (API?.IsLoggedIn != true) if (API?.IsLoggedIn != true)
@ -131,8 +130,13 @@ namespace osu.Game.Overlays
{ {
clearPanels(); clearPanels();
loading.Show();
if (Users == null) if (Users == null)
{
loading.Hide();
return; return;
}
var newPanels = new FillFlowContainer<SocialPanel> var newPanels = new FillFlowContainer<SocialPanel>
{ {
@ -167,15 +171,15 @@ namespace osu.Game.Overlays
LoadComponentAsync(newPanels, f => LoadComponentAsync(newPanels, f =>
{ {
if (panels != null) loading.Hide();
ScrollFlow.Remove(panels);
ScrollFlow.Add(panels = newPanels); ScrollFlow.Add(panels = newPanels);
}); });
} }
private void updateUsers(IEnumerable<User> newUsers) private void updateUsers(IEnumerable<User> newUsers)
{ {
loading.Show();
var sortDirection = Filter.DisplayStyleControl.Dropdown.Current.Value; var sortDirection = Filter.DisplayStyleControl.Dropdown.Current.Value;
IEnumerable<User> sortedUsers = newUsers; IEnumerable<User> sortedUsers = newUsers;
@ -226,7 +230,6 @@ namespace osu.Game.Overlays
} }
Users = sortedUsers; Users = sortedUsers;
loading.Hide();
recreatePanels(Filter.DisplayStyleControl.DisplayStyle.Value); recreatePanels(Filter.DisplayStyleControl.DisplayStyle.Value);
} }