Simplify code and remove generic

This commit is contained in:
Dean Herbert
2018-05-15 21:08:55 +09:00
parent 0325b1bd7a
commit 28df77e838
2 changed files with 36 additions and 57 deletions

View File

@ -8,67 +8,46 @@ using osu.Framework.Screens;
namespace osu.Game.Graphics.UserInterface
{
public class ScreenBreadcrumbControl<T> : BreadcrumbControl<T> where T : Screen
/// <summary>
/// A <see cref="BreadcrumbControl"/> which follows the active screen (and allows navigation) in a <see cref="Screen"/> stack.
/// </summary>
public class ScreenBreadcrumbControl : BreadcrumbControl<Screen>
{
private T currentScreen;
public T CurrentScreen
private Screen last;
public ScreenBreadcrumbControl(Screen initialScreen)
{
get { return currentScreen; }
set
Current.ValueChanged += newScreen =>
{
if (value == currentScreen) return;
if (CurrentScreen != null)
{
CurrentScreen.Exited -= onExited;
CurrentScreen.ModePushed -= onPushed;
}
else
{
// this is the first screen in the stack, so call the initial onPushed
currentScreen = value;
onPushed(CurrentScreen);
}
currentScreen = value;
if (CurrentScreen != null)
{
CurrentScreen.Exited += onExited;
CurrentScreen.ModePushed += onPushed;
Current.Value = CurrentScreen;
OnScreenChanged?.Invoke(CurrentScreen);
}
}
}
public event Action<T> OnScreenChanged;
public ScreenBreadcrumbControl()
{
Current.ValueChanged += s =>
{
if (s != CurrentScreen)
{
CurrentScreen = s;
s.MakeCurrent();
}
if (last != newScreen && !newScreen.IsCurrentScreen)
newScreen.MakeCurrent();
};
onPushed(initialScreen);
}
private void onExited(Screen screen)
private void screenChanged(Screen newScreen)
{
CurrentScreen = screen as T;
if (last != null)
{
last.Exited -= screenChanged;
last.ModePushed -= onPushed;
}
last = newScreen;
newScreen.Exited += screenChanged;
newScreen.ModePushed += onPushed;
Current.Value = newScreen;
}
private void onPushed(Screen screen)
{
var newScreen = screen as T;
Items.ToList().SkipWhile(i => i != Current.Value).Skip(1).ForEach(RemoveItem);
AddItem(newScreen);
AddItem(screen);
CurrentScreen = newScreen;
screenChanged(screen);
}
}
}