Combine all loading animation implementations

This commit is contained in:
Dean Herbert
2020-02-21 15:31:40 +09:00
parent e18d736e4a
commit 623b78d675
15 changed files with 185 additions and 225 deletions

View File

@ -23,7 +23,7 @@ namespace osu.Game.Screens.Multi.Lounge
protected readonly FilterControl Filter;
private readonly Container content;
private readonly ProcessingOverlay processingOverlay;
private readonly LoadingLayer loadingLayer;
[Resolved]
private Bindable<Room> currentRoom { get; set; }
@ -58,7 +58,7 @@ namespace osu.Game.Screens.Multi.Lounge
Child = new RoomsContainer { JoinRequested = joinRequested }
},
},
processingOverlay = new ProcessingOverlay(searchContainer),
loadingLayer = new LoadingLayer(searchContainer),
}
},
new RoomInspector
@ -126,12 +126,12 @@ namespace osu.Game.Screens.Multi.Lounge
private void joinRequested(Room room)
{
processingOverlay.Show();
loadingLayer.Show();
RoomManager?.JoinRoom(room, r =>
{
Open(room);
processingOverlay.Hide();
}, _ => processingOverlay.Hide());
loadingLayer.Hide();
}, _ => loadingLayer.Hide());
}
/// <summary>