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

Remove #nullable disabled from EditorTable and it's derived classes

Browse Source
This commit is contained in:
Jai Sharma 2022-11-27 02:45:56 +00:00
parent 1a914d0df7
commit b6d7bec240
3 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Screens/Edit/EditorTable.cs
View File

@ -1,8 +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.
#nullable disable using System;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Extensions.LocalisationExtensions; using osu.Framework.Extensions.LocalisationExtensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
@ -84,11 +83,6 @@ namespace osu.Game.Screens.Edit
Alpha = 0, Alpha = 0,
}, },
}; };
// todo delete
Action = () =>
{
};
} }
private Color4 colourHover; private Color4 colourHover;

18
osu.Game/Screens/Edit/Timing/ControlPointTable.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 System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -23,10 +21,10 @@ namespace osu.Game.Screens.Edit.Timing
public partial class ControlPointTable : EditorTable public partial class ControlPointTable : EditorTable
{ {
[Resolved] [Resolved]
private Bindable<ControlPointGroup> selectedGroup { get; set; } private Bindable<ControlPointGroup> selectedGroup { get; set; } = null!;
[Resolved] [Resolved]
private EditorClock clock { get; set; } private EditorClock clock { get; set; } = null!;
public const float TIMING_COLUMN_WIDTH = 230; public const float TIMING_COLUMN_WIDTH = 230;
@ -81,8 +79,8 @@ namespace osu.Game.Screens.Edit.Timing
{ {
var columns = new List<TableColumn> var columns = new List<TableColumn>
{ {
new TableColumn("Time", Anchor.CentreLeft, new Dimension(GridSizeMode.Absolute, TIMING_COLUMN_WIDTH)), new TableColumn(@"Time", Anchor.CentreLeft, new Dimension(GridSizeMode.Absolute, TIMING_COLUMN_WIDTH)),
new TableColumn("Attributes", Anchor.CentreLeft), new TableColumn(@"Attributes", Anchor.CentreLeft),
}; };
return columns.ToArray(); return columns.ToArray();
@ -162,12 +160,13 @@ namespace osu.Game.Screens.Edit.Timing
.Where(matchFunction) .Where(matchFunction)
.Select(createAttribute) .Select(createAttribute)
.Where(c => c != null) .Where(c => c != null)
.Select(c => c!)
// arbitrary ordering to make timing points first. // arbitrary ordering to make timing points first.
// probably want to explicitly define order in the future. // probably want to explicitly define order in the future.
.OrderByDescending(c => c.GetType().Name); .OrderByDescending(c => c.GetType().Name);
} }
private Drawable createAttribute(ControlPoint controlPoint) private Drawable? createAttribute(ControlPoint controlPoint)
{ {
switch (controlPoint) switch (controlPoint)
{ {
@ -182,9 +181,10 @@ namespace osu.Game.Screens.Edit.Timing
case SampleControlPoint sample: case SampleControlPoint sample:
return new SampleRowAttribute(sample); return new SampleRowAttribute(sample);
}
return null; default:
return null;
}
} }
} }
} }

24
osu.Game/Screens/Edit/Verify/IssueTable.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 System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
@ -20,19 +18,19 @@ namespace osu.Game.Screens.Edit.Verify
{ {
public partial class IssueTable : EditorTable public partial class IssueTable : EditorTable
{ {
[Resolved] private Bindable<Issue> selectedIssue = null!;
private VerifyScreen verify { get; set; }
private Bindable<Issue> selectedIssue;
[Resolved] [Resolved]
private EditorClock clock { get; set; } private VerifyScreen verify { get; set; } = null!;
[Resolved] [Resolved]
private EditorBeatmap editorBeatmap { get; set; } private EditorClock clock { get; set; } = null!;
[Resolved] [Resolved]
private Editor editor { get; set; } private EditorBeatmap editorBeatmap { get; set; } = null!;
[Resolved]
private Editor editor { get; set; } = null!;
public IEnumerable<Issue> Issues public IEnumerable<Issue> Issues
{ {
@ -88,10 +86,10 @@ namespace osu.Game.Screens.Edit.Verify
var columns = new List<TableColumn> var columns = new List<TableColumn>
{ {
new TableColumn(string.Empty, Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize)), new TableColumn(string.Empty, Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize)),
new TableColumn("Type", Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize, minSize: 60)), new TableColumn(@"Type", Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize, minSize: 60)),
new TableColumn("Time", Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize, minSize: 60)), new TableColumn(@"Time", Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize, minSize: 60)),
new TableColumn("Message", Anchor.CentreLeft), new TableColumn(@"Message", Anchor.CentreLeft),
new TableColumn("Category", Anchor.CentreRight, new Dimension(GridSizeMode.AutoSize)), new TableColumn(@"Category", Anchor.CentreRight, new Dimension(GridSizeMode.AutoSize)),
}; };
return columns.ToArray(); return columns.ToArray();