From 5ccfc1918e1a89a1639e016759e9c7b72ad29b4c Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Thu, 12 Oct 2017 17:51:01 +0900 Subject: [PATCH] Hook up more bindables for hitobjects/hitsounds --- .../Edit/Screens/Compose/Timeline/ScrollableTimeline.cs | 8 ++++++-- .../Compose/Timeline/ScrollingTimelineContainer.cs | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollableTimeline.cs b/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollableTimeline.cs index bf1237f1f7..c64b223fa1 100644 --- a/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollableTimeline.cs +++ b/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollableTimeline.cs @@ -23,6 +23,8 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Timeline Masking = true; CornerRadius = 5; + OsuCheckbox hitObjectsCheckbox; + OsuCheckbox hitSoundsCheckbox; OsuCheckbox waveformCheckbox; InternalChildren = new Drawable[] { @@ -59,8 +61,8 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Timeline Spacing = new Vector2(0, 4), Children = new[] { - new OsuCheckbox { LabelText = "Hitobjects" }, - new OsuCheckbox { LabelText = "Hitsounds" }, + hitObjectsCheckbox = new OsuCheckbox { LabelText = "Hitobjects" }, + hitSoundsCheckbox = new OsuCheckbox { LabelText = "Hitsounds" }, waveformCheckbox = new OsuCheckbox { LabelText = "Waveform" } } } @@ -107,6 +109,8 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Timeline } }; + hitObjectsCheckbox.Current.Value = true; + hitSoundsCheckbox.Current.Value = true; waveformCheckbox.Current.Value = true; timelineContainer.Beatmap.BindTo(Beatmap); diff --git a/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs b/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs index a15db3d0df..c1bf2c3f57 100644 --- a/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs +++ b/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs @@ -14,6 +14,8 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Timeline { internal class ScrollingTimelineContainer : ScrollContainer { + public readonly Bindable HitObjectsVisible = new Bindable(); + public readonly Bindable HitSoundsVisible = new Bindable(); public readonly Bindable WaveformVisible = new Bindable(); public readonly Bindable Beatmap = new Bindable();