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

Also add toggle for ticks display

Browse Source
This commit is contained in:
Dean Herbert 2020-10-01 18:14:10 +09:00
parent b654396a4c
commit 00a19b4879
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
public readonly Bindable<bool> ControlPointsVisible = new Bindable<bool>(); public readonly Bindable<bool> ControlPointsVisible = new Bindable<bool>();
public readonly Bindable<bool> TicksVisible = new Bindable<bool>();
public readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>(); public readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
[Resolved] [Resolved]
@ -61,6 +63,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
private WaveformGraph waveform; private WaveformGraph waveform;
private ControlPointPart controlPoints; private ControlPointPart controlPoints;
private TimelineTickDisplay ticks;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(IBindable<WorkingBeatmap> beatmap, OsuColour colours) private void load(IBindable<WorkingBeatmap> beatmap, OsuColour colours)
@ -80,7 +83,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
{ {
RelativeSizeAxes = Axes.Both RelativeSizeAxes = Axes.Both
}, },
new TimelineTickDisplay(), ticks = new TimelineTickDisplay(),
}); });
// We don't want the centre marker to scroll // We don't want the centre marker to scroll
@ -88,6 +91,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
WaveformVisible.ValueChanged += visible => waveform.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint); WaveformVisible.ValueChanged += visible => waveform.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint);
ControlPointsVisible.ValueChanged += visible => controlPoints.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint); ControlPointsVisible.ValueChanged += visible => controlPoints.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint);
TicksVisible.ValueChanged += visible => ticks.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint);
Beatmap.BindTo(beatmap); Beatmap.BindTo(beatmap);
Beatmap.BindValueChanged(b => Beatmap.BindValueChanged(b =>

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

@ -26,6 +26,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
OsuCheckbox waveformCheckbox; OsuCheckbox waveformCheckbox;
OsuCheckbox controlPointsCheckbox; OsuCheckbox controlPointsCheckbox;
OsuCheckbox ticksCheckbox;
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
@ -72,6 +73,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
{ {
LabelText = "Control Points", LabelText = "Control Points",
Current = { Value = true }, Current = { Value = true },
},
ticksCheckbox = new OsuCheckbox
{
LabelText = "Ticks",
Current = { Value = true },
} }
} }
} }
@ -131,6 +137,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
Timeline.WaveformVisible.BindTo(waveformCheckbox.Current); Timeline.WaveformVisible.BindTo(waveformCheckbox.Current);
Timeline.ControlPointsVisible.BindTo(controlPointsCheckbox.Current); Timeline.ControlPointsVisible.BindTo(controlPointsCheckbox.Current);
Timeline.TicksVisible.BindTo(ticksCheckbox.Current);
} }
private void changeZoom(float change) => Timeline.Zoom += change; private void changeZoom(float change) => Timeline.Zoom += change;