RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Define toolbarElements

This commit is contained in:
Dean Herbert 2019-05-14 18:34:25 +09:00
parent a0c03d7fc3
commit ec5b024fa6
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/OsuGame.cs
View File

@ -99,6 +99,8 @@ public class OsuGame : OsuGameBase, IKeyBindingHandler<GlobalAction>
private readonly List<OverlayContainer> overlays = new List<OverlayContainer>();
private readonly List<OverlayContainer> toolbarElements = new List<OverlayContainer>();
private readonly List<OverlayContainer> visibleBlockingOverlays = new List<OverlayContainer>();
// todo: move this to SongSelect once Screen has the ability to unsuspend.
@ -142,8 +144,8 @@ public void CloseAllOverlays(bool hideToolbarElements = true)
if (hideToolbarElements)
{
Toolbar.State = Visibility.Hidden;
musicController.State = Visibility.Hidden;
foreach (var overlay in toolbarElements)
overlay.State = Visibility.Hidden;
}
}
@ -420,7 +422,11 @@ protected override void LoadComplete()
CloseAllOverlays(false);
menuScreen?.MakeCurrent();
},
}, topMostOverlayContent.Add);
}, d =>
{
topMostOverlayContent.Add(d);
toolbarElements.Add(d);
});
loadComponentSingleFile(volume = new VolumeOverlay(), leftFloatingOverlayContent.Add);
loadComponentSingleFile(new OnScreenDisplay(), Add, true);
@ -455,7 +461,11 @@ protected override void LoadComplete()
GetToolbarHeight = () => ToolbarOffset,
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
}, rightFloatingOverlayContent.Add, true);
}, d =>
{
rightFloatingOverlayContent.Add(d);
toolbarElements.Add(d);
}, true);
loadComponentSingleFile(new AccountCreationOverlay(), topMostOverlayContent.Add, true);
loadComponentSingleFile(new DialogOverlay(), topMostOverlayContent.Add, true);