1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 09:32:55 +08:00

Merge branch 'master' into fix-hudoverlay-presence

This commit is contained in:
Dean Herbert 2018-12-04 22:14:54 +09:00 committed by GitHub
commit 4f5028bbc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 7 deletions

View File

@ -85,6 +85,17 @@ namespace osu.Game.Screens.Select
}
}
protected override void ExitFromBack()
{
if (modSelect.State == Visibility.Visible)
{
modSelect.Hide();
return;
}
base.ExitFromBack();
}
protected override void UpdateBeatmap(WorkingBeatmap beatmap)
{
beatmap.Mods.BindTo(selectedMods);
@ -124,12 +135,6 @@ namespace osu.Game.Screens.Select
protected override bool OnExiting(Screen next)
{
if (modSelect.State == Visibility.Visible)
{
modSelect.Hide();
return true;
}
if (base.OnExiting(next))
return true;

View File

@ -191,13 +191,15 @@ namespace osu.Game.Screens.Select
});
Add(Footer = new Footer
{
OnBack = Exit,
OnBack = ExitFromBack,
});
FooterPanels.Add(BeatmapOptions = new BeatmapOptionsOverlay());
}
}
protected virtual void ExitFromBack() => Exit();
[BackgroundDependencyLoader(true)]
private void load(BeatmapManager beatmaps, AudioManager audio, DialogOverlay dialog, OsuColour colours)
{