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

Convert everything to use IScreen

Browse Source
This commit is contained in:
smoogipoo
2019-01-23 20:52:00 +09:00
parent d86f2e04b4
commit 8ea7ec6445
47 changed files with 426 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Screens/Edit/Editor.cs
View File

@ -65,7 +65,7 @@ namespace osu.Game.Screens.Edit
SummaryTimeline timeline;
PlaybackControl playback;
Children = new[]
InternalChildren = new[]
{
new Container
{
@ -96,7 +96,7 @@ namespace osu.Game.Screens.Edit
{
new EditorMenuItem("Export", MenuItemType.Standard, exportBeatmap),
new EditorMenuItemSpacer(),
new EditorMenuItem("Exit", MenuItemType.Standard, Exit)
new EditorMenuItem("Exit", MenuItemType.Standard, this.Exit)
}
}
}
@ -194,20 +194,20 @@ namespace osu.Game.Screens.Edit
return true;
}
protected override void OnResuming(Screen last)
public override void OnResuming(IScreen last)
{
Beatmap.Value.Track?.Stop();
base.OnResuming(last);
}
protected override void OnEntering(Screen last)
public override void OnEntering(IScreen last)
{
base.OnEntering(last);
Background.FadeColour(Color4.DarkGray, 500);
Beatmap.Value.Track?.Stop();
}
protected override bool OnExiting(Screen next)
public override bool OnExiting(IScreen next)
{
Background.FadeColour(Color4.White, 500);
if (Beatmap.Value.Track != null)