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

Update UI components to use new grouping

Browse Source
This commit is contained in:
Dean Herbert
2019-10-25 20:13:22 +09:00
parent 32242f22de
commit b8efc59cdc
3 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Screens/Edit/Timing/TimingScreen.cs
View File

@ -1,8 +1,6 @@
// 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.
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
@ -21,7 +19,7 @@ namespace osu.Game.Screens.Edit.Timing
public class TimingScreen : EditorScreenWithTimeline
{
[Cached]
private Bindable<IEnumerable<ControlPoint>> selectedPoints = new Bindable<IEnumerable<ControlPoint>>();
private Bindable<ControlPointGroup> selectedPoints = new Bindable<ControlPointGroup>();
[Resolved]
private IAdjustableClock clock { get; set; }
@ -48,7 +46,7 @@ namespace osu.Game.Screens.Edit.Timing
{
base.LoadComplete();
selectedPoints.BindValueChanged(selected => { clock.Seek(selected.NewValue.First().Time); });
selectedPoints.BindValueChanged(selected => { clock.Seek(selected.NewValue.Time); });
}
public class ControlPointList : CompositeDrawable
@ -59,7 +57,7 @@ namespace osu.Game.Screens.Edit.Timing
protected IBindable<WorkingBeatmap> Beatmap { get; private set; }
[Resolved]
private Bindable<IEnumerable<ControlPoint>> selectedPoints { get; set; }
private Bindable<ControlPointGroup> selectedPoints { get; set; }
[BackgroundDependencyLoader]
private void load(OsuColour colours)
@ -78,7 +76,7 @@ namespace osu.Game.Screens.Edit.Timing
RelativeSizeAxes = Axes.Both,
Child = new ControlPointTable
{
ControlPoints = Beatmap.Value.Beatmap.ControlPointInfo.AllControlPoints
ControlGroups = Beatmap.Value.Beatmap.ControlPointInfo.Groups
}
},
new FillFlowContainer