h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 19:22:54 +08:00
Code Issues Releases Wiki Activity

Apply NRT to timeline related classes

Browse Source
This commit is contained in:
Dean Herbert 2023-07-14 14:04:12 +09:00
parent 56acc9e3dd
commit ebaf63b764
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
View File

@ -1,8 +1,6 @@
// 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.
#nullable disable
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;
@ -18,16 +16,16 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
{ {
public partial class TimelineArea : CompositeDrawable public partial class TimelineArea : CompositeDrawable
{ {
public Timeline Timeline; public Timeline Timeline = null!;
private readonly Drawable userContent; private readonly Drawable userContent;
public TimelineArea(Drawable content = null) public TimelineArea(Drawable? content = null)
{ {
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;
userContent = content ?? Drawable.Empty(); userContent = content ?? Empty();
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]

12
osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
View File

@ -1,8 +1,6 @@
// 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.
#nullable disable
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;
@ -18,17 +16,17 @@ namespace osu.Game.Screens.Edit
{ {
private const float padding = 10; private const float padding = 10;
private Container timelineContainer; private Container timelineContainer = null!;
private Container mainContent = null!;
private LoadingSpinner spinner = null!;
protected EditorScreenWithTimeline(EditorScreenMode type) protected EditorScreenWithTimeline(EditorScreenMode type)
: base(type) : base(type)
{ {
} }
private Container mainContent;
private LoadingSpinner spinner;
[BackgroundDependencyLoader(true)] [BackgroundDependencyLoader(true)]
private void load(OverlayColourProvider colourProvider) private void load(OverlayColourProvider colourProvider)
{ {