h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-16 03:02:56 +08:00
Code Issues Releases Wiki Activity

Remove osd prefix and prefer upper-case OSD

Browse Source
This commit is contained in:
Dean Herbert 2019-07-11 15:09:06 +09:00
parent df75f9d312
commit 3bc789fca8
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ using osu.Framework.Configuration;
using osu.Framework.Configuration.Tracking; using osu.Framework.Configuration.Tracking;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Overlays; using osu.Game.Overlays;
using osu.Game.Overlays.OSD;
namespace osu.Game.Tests.Visual.UserInterface namespace osu.Game.Tests.Visual.UserInterface
{ {
@ -22,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 Overlays.OSD.OsdToast())); AddStep("Display empty osd toast", () => osd.Display(new Toast()));
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);

6
osu.Game/Overlays/OSD/OsdToast.cs → osu.Game/Overlays/OSD/Toast.cs
View File

@ -1,19 +1,19 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osuTK.Graphics; using osuTK.Graphics;
namespace osu.Game.Overlays.OSD namespace osu.Game.Overlays.OSD
{ {
public class OsdToast : Container public class Toast : Container
{ {
private readonly Container content; private readonly Container content;
protected override Container<Drawable> Content => content; protected override Container<Drawable> Content => content;
public OsdToast() public Toast()
{ {
Anchor = Anchor.Centre; Anchor = Anchor.Centre;
Origin = Anchor.Centre; Origin = Anchor.Centre;

6
osu.Game/Overlays/OSD/OsdTrackedSettingToast.cs → osu.Game/Overlays/OSD/TrackedSettingToast.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Configuration.Tracking; using osu.Framework.Configuration.Tracking;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
@ -13,13 +14,12 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osuTK; using osuTK;
using osuTK.Graphics; using osuTK.Graphics;
using System;
namespace osu.Game.Overlays.OSD namespace osu.Game.Overlays.OSD
{ {
public class OsdTrackedSettingToast : OsdToast public class TrackedSettingToast : Toast
{ {
public OsdTrackedSettingToast(SettingDescription description) public TrackedSettingToast(SettingDescription description)
{ {
SpriteText textLine2; SpriteText textLine2;
FillFlowContainer<OptionLight> optionLights; FillFlowContainer<OptionLight> optionLights;

6
osu.Game/Overlays/OnScreenDisplay.cs
View File

@ -97,16 +97,16 @@ namespace osu.Game.Overlays
} }
/// <summary> /// <summary>
/// Displays the given <see cref="OsdToast"/> as parameter on the OSD /// Displays the given <see cref="Toast"/> as parameter on the OSD
/// </summary> /// </summary>
/// <param name="toast"></param> /// <param name="toast"></param>
public void Display(OsdToast toast) public void Display(Toast toast)
{ {
box.Child = toast; box.Child = toast;
DisplayTemporarily(box); DisplayTemporarily(box);
} }
private void displayTrackedSettingChange(SettingDescription description) => Schedule(() => Display(new OsdTrackedSettingToast(description))); private void displayTrackedSettingChange(SettingDescription description) => Schedule(() => Display(new TrackedSettingToast(description)));
private TransformSequence<Drawable> fadeIn; private TransformSequence<Drawable> fadeIn;
private ScheduledDelegate fadeOut; private ScheduledDelegate fadeOut;