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

Make Toast base class abstract

Browse Source
This commit is contained in:
Dean Herbert 2019-07-11 15:15:34 +09:00
parent dd13e2508a
commit 2c62891c48
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Tests/Visual/UserInterface/TestSceneOnScreenDisplay.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Tests.Visual.UserInterface
osd.BeginTracking(this, config); osd.BeginTracking(this, config);
Add(osd); Add(osd);
AddStep("Display empty osd toast", () => osd.Display(new Toast())); AddStep("Display empty osd toast", () => osd.Display(new EmptyToast()));
AddRepeatStep("Change toggle (no bind)", () => config.ToggleSetting(TestConfigSetting.ToggleSettingNoKeybind), 2); AddRepeatStep("Change toggle (no bind)", () => config.ToggleSetting(TestConfigSetting.ToggleSettingNoKeybind), 2);
AddRepeatStep("Change toggle (with bind)", () => config.ToggleSetting(TestConfigSetting.ToggleSettingWithKeybind), 2); AddRepeatStep("Change toggle (with bind)", () => config.ToggleSetting(TestConfigSetting.ToggleSettingWithKeybind), 2);
AddRepeatStep("Change enum (no bind)", () => config.IncrementEnumSetting(TestConfigSetting.EnumSettingNoKeybind), 3); AddRepeatStep("Change enum (no bind)", () => config.IncrementEnumSetting(TestConfigSetting.EnumSettingNoKeybind), 3);
@ -88,6 +88,10 @@ namespace osu.Game.Tests.Visual.UserInterface
Setting4 Setting4
} }
private class EmptyToast : Toast
{
}
private class TestOnScreenDisplay : OnScreenDisplay private class TestOnScreenDisplay : OnScreenDisplay
{ {
protected override void DisplayTemporarily(Drawable toDisplay) => toDisplay.FadeIn().ResizeHeightTo(110); protected override void DisplayTemporarily(Drawable toDisplay) => toDisplay.FadeIn().ResizeHeightTo(110);

4
osu.Game/Overlays/OSD/Toast.cs
View File

@ -8,12 +8,12 @@ using osuTK.Graphics;
namespace osu.Game.Overlays.OSD namespace osu.Game.Overlays.OSD
{ {
public class Toast : Container public abstract class Toast : Container
{ {
private readonly Container content; private readonly Container content;
protected override Container<Drawable> Content => content; protected override Container<Drawable> Content => content;
public Toast() protected Toast()
{ {
Anchor = Anchor.Centre; Anchor = Anchor.Centre;
Origin = Anchor.Centre; Origin = Anchor.Centre;