sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-20 18:58:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

Simplify code and remove generic

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game.Tests/Visual/TestCaseScreenBreadcrumbs.cs → osu.Game.Tests/Visual/TestCaseScreenBreadcrumbControl.cs
View File

@ -6,6 +6,7 @@ using NUnit.Framework;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Screens;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
@ -15,18 +16,19 @@ using OpenTK;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual
{ {
[TestFixture] [TestFixture]
public class TestCaseScreenBreadcrumbs : OsuTestCase public class TestCaseScreenBreadcrumbControl : OsuTestCase
{ {
private readonly ScreenBreadcrumbControl<TestScreen> breadcrumbs; private readonly ScreenBreadcrumbControl breadcrumbs;
private TestScreen currentScreen, changedScreen; private Screen currentScreen, changedScreen;
public TestCaseScreenBreadcrumbs() public TestCaseScreenBreadcrumbControl()
{ {
TestScreen startScreen; TestScreen startScreen;
OsuSpriteText titleText; OsuSpriteText titleText;
Children = new Drawable[] Children = new Drawable[]
{ {
changedScreen = currentScreen = startScreen = new TestScreenOne(),
new FillFlowContainer new FillFlowContainer
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
@ -35,23 +37,21 @@ namespace osu.Game.Tests.Visual
Spacing = new Vector2(10), Spacing = new Vector2(10),
Children = new Drawable[] Children = new Drawable[]
{ {
breadcrumbs = new ScreenBreadcrumbControl<TestScreen> breadcrumbs = new ScreenBreadcrumbControl(startScreen)
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
}, },
titleText = new OsuSpriteText(), titleText = new OsuSpriteText(),
}, },
}, },
currentScreen = startScreen = new TestScreenOne(),
}; };
breadcrumbs.OnScreenChanged += s => breadcrumbs.Current.ValueChanged += s =>
{ {
titleText.Text = $"Changed to {s.ToString()}"; titleText.Text = $"Changed to {s.ToString()}";
changedScreen = s; changedScreen = s;
}; };
AddStep(@"make start current", () => breadcrumbs.CurrentScreen = startScreen);
assertCurrent(); assertCurrent();
pushNext(); pushNext();
assertCurrent(); assertCurrent();
@ -75,7 +75,7 @@ namespace osu.Game.Tests.Visual
breadcrumbs.StripColour = colours.Blue; breadcrumbs.StripColour = colours.Blue;
} }
private void pushNext() => AddStep(@"push next screen", () => currentScreen = currentScreen.PushNext()); private void pushNext() => AddStep(@"push next screen", () => currentScreen = ((TestScreen)currentScreen).PushNext());
private void assertCurrent() => AddAssert(@"assert the current screen is correct", () => currentScreen == changedScreen); private void assertCurrent() => AddAssert(@"assert the current screen is correct", () => currentScreen == changedScreen);
private abstract class TestScreen : OsuScreen private abstract class TestScreen : OsuScreen

75
osu.Game/Graphics/UserInterface/ScreenBreadcrumbControl.cs
View File

@ -8,67 +8,46 @@ using osu.Framework.Screens;
namespace osu.Game.Graphics.UserInterface 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; private Screen last;
public T CurrentScreen
public ScreenBreadcrumbControl(Screen initialScreen)
{ {
get { return currentScreen; } Current.ValueChanged += newScreen =>
set
{ {
if (value == currentScreen) return; if (last != newScreen && !newScreen.IsCurrentScreen)
newScreen.MakeCurrent();
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();
}
}; };
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) private void onPushed(Screen screen)
{ {
var newScreen = screen as T;
Items.ToList().SkipWhile(i => i != Current.Value).Skip(1).ForEach(RemoveItem); Items.ToList().SkipWhile(i => i != Current.Value).Skip(1).ForEach(RemoveItem);
AddItem(newScreen); AddItem(screen);
CurrentScreen = newScreen; screenChanged(screen);
} }
} }
} }