mirror of
https://github.com/ppy/osu.git
synced 2025-02-13 17:53:21 +08:00
Check sub screen's OnBackButton instead
This commit is contained in:
parent
21ed9df1ea
commit
73e1bf0d89
@ -20,9 +20,9 @@ using osu.Game.Online.Multiplayer;
|
|||||||
using osu.Game.Screens.Menu;
|
using osu.Game.Screens.Menu;
|
||||||
using osu.Game.Screens.Multi.Components;
|
using osu.Game.Screens.Multi.Components;
|
||||||
using osu.Game.Screens.Multi.Lounge;
|
using osu.Game.Screens.Multi.Lounge;
|
||||||
|
using osu.Game.Screens.Multi.Lounge.Components;
|
||||||
using osu.Game.Screens.Multi.Match;
|
using osu.Game.Screens.Multi.Match;
|
||||||
using osu.Game.Screens.Multi.Match.Components;
|
using osu.Game.Screens.Multi.Match.Components;
|
||||||
using osu.Game.Screens.Select;
|
|
||||||
using osuTK;
|
using osuTK;
|
||||||
|
|
||||||
namespace osu.Game.Screens.Multi
|
namespace osu.Game.Screens.Multi
|
||||||
@ -48,7 +48,7 @@ namespace osu.Game.Screens.Multi
|
|||||||
private readonly Bindable<Room> selectedRoom = new Bindable<Room>();
|
private readonly Bindable<Room> selectedRoom = new Bindable<Room>();
|
||||||
|
|
||||||
[Cached]
|
[Cached]
|
||||||
private readonly Bindable<Lounge.Components.FilterCriteria> currentFilter = new Bindable<Lounge.Components.FilterCriteria>(new Lounge.Components.FilterCriteria());
|
private readonly Bindable<FilterCriteria> currentFilter = new Bindable<FilterCriteria>(new FilterCriteria());
|
||||||
|
|
||||||
[Cached(Type = typeof(IRoomManager))]
|
[Cached(Type = typeof(IRoomManager))]
|
||||||
private RoomManager roomManager;
|
private RoomManager roomManager;
|
||||||
@ -265,13 +265,8 @@ namespace osu.Game.Screens.Multi
|
|||||||
|
|
||||||
public override bool OnBackButton()
|
public override bool OnBackButton()
|
||||||
{
|
{
|
||||||
var songSelect = screenStack.CurrentScreen as MatchSongSelect;
|
if ((screenStack.CurrentScreen as IMultiplayerSubScreen).OnBackButton())
|
||||||
|
|
||||||
if (songSelect?.ModSelect.State.Value == Visibility.Visible)
|
|
||||||
{
|
|
||||||
songSelect.ModSelect.Hide();
|
|
||||||
return true;
|
return true;
|
||||||
}
|
|
||||||
|
|
||||||
if (screenStack.CurrentScreen != null && !(screenStack.CurrentScreen is LoungeSubScreen))
|
if (screenStack.CurrentScreen != null && !(screenStack.CurrentScreen is LoungeSubScreen))
|
||||||
{
|
{
|
||||||
|
@ -86,7 +86,7 @@ namespace osu.Game.Screens.Select
|
|||||||
[Resolved]
|
[Resolved]
|
||||||
private BeatmapManager beatmaps { get; set; }
|
private BeatmapManager beatmaps { get; set; }
|
||||||
|
|
||||||
public ModSelectOverlay ModSelect { get; private set; }
|
protected ModSelectOverlay ModSelect { get; private set; }
|
||||||
|
|
||||||
protected SampleChannel SampleConfirm { get; private set; }
|
protected SampleChannel SampleConfirm { get; private set; }
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user