Skip to content

Commit

Permalink
Merge pull request #29231 from peppy/timeline-break-behind-objects
Browse files Browse the repository at this point in the history
Show breaks behind objects in timeline
  • Loading branch information
smoogipoo committed Aug 2, 2024
2 parents 8a10d63 + 548fd9c commit 7bf96ce
Showing 1 changed file with 13 additions and 8 deletions.
21 changes: 13 additions & 8 deletions osu.Game/Screens/Edit/Compose/ComposeScreen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,19 +69,24 @@ protected override Drawable CreateTimelineContent()
if (ruleset == null || composer == null)
return base.CreateTimelineContent();

TimelineBreakDisplay breakDisplay = new TimelineBreakDisplay
{
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Height = 0.75f,
};

return wrapSkinnableContent(new Container
{
RelativeSizeAxes = Axes.Both,
Children = new Drawable[]
Children = new[]
{
// We want to display this below hitobjects to better expose placement objects visually.
// It needs to be above the blueprint container to handle drags on breaks though.
breakDisplay.CreateProxy(),
new TimelineBlueprintContainer(composer),
new TimelineBreakDisplay
{
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Height = 0.75f,
},
breakDisplay
}
});
}
Expand Down

0 comments on commit 7bf96ce

Please sign in to comment.