sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-07 00:23:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove ScreenChanged

Browse Source
This commit is contained in:
Dean Herbert
2017-12-26 16:09:40 +09:00
parent c15b2382a2
commit f737a64189
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game/OsuGame.cs
View File

@ -355,8 +355,6 @@ namespace osu.Game
public bool OnReleased(GlobalAction action) => false; public bool OnReleased(GlobalAction action) => false;
public event Action<Screen> ScreenChanged;
private Container mainContent; private Container mainContent;
private Container overlayContent; private Container overlayContent;
@ -374,19 +372,6 @@ namespace osu.Game
notifications.State = Visibility.Hidden; notifications.State = Visibility.Hidden;
} }
private void screenChanged(Screen newScreen)
{
currentScreen = newScreen as OsuScreen;
if (currentScreen == null)
{
Exit();
return;
}
ScreenChanged?.Invoke(newScreen);
}
protected override bool OnExiting() protected override bool OnExiting()
{ {
if (screenStack.ChildScreen == null) return false; if (screenStack.ChildScreen == null) return false;
@ -434,13 +419,12 @@ namespace osu.Game
{ {
newScreen.ModePushed += screenAdded; newScreen.ModePushed += screenAdded;
newScreen.Exited += screenRemoved; newScreen.Exited += screenRemoved;
screenChanged(newScreen);
} }
private void screenRemoved(Screen newScreen) private void screenRemoved(Screen newScreen)
{ {
screenChanged(newScreen); if (newScreen == null)
Exit();
} }
} }
} }