h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 09:32:55 +08:00
Code Issues Releases Wiki Activity

Adjust breaks in timeline to be centered with waveform / hitobjects

Browse Source
This commit is contained in:
Dean Herbert 2024-07-12 15:41:51 +09:00
parent 2ad2ae0c16
commit f65ab6736d
No known key found for this signature in database
2 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,11 +29,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
public Action<BreakPeriod>? OnDeleted { get; init; }
private Box background = null!;
[Resolved]
private OsuColour colours { get; set; } = null!;
public TimelineBreak(BreakPeriod b)
{
Break.Value = b;
@ -53,11 +48,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Horizontal = 5 },
Child = background = new Box
Child = new Box
{
RelativeSizeAxes = Axes.Both,
Colour = colours.Gray5,
Alpha = 0.7f,
Alpha = 0.9f,
},
},
new DragHandle(isStartHandle: true)
@ -88,23 +83,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
}, true);
}
protected override bool OnHover(HoverEvent e)
{
updateState();
return true;
}
protected override void OnHoverLost(HoverLostEvent e)
{
updateState();
base.OnHoverLost(e);
}
private void updateState()
{
background.FadeColour(IsHovered ? colours.Gray6 : colours.Gray5, 400, Easing.OutQuint);
}
public MenuItem[] ContextMenuItems => new MenuItem[]
{
new OsuMenuItem(CommonStrings.ButtonsDelete, MenuItemType.Destructive, () => OnDeleted?.Invoke(Break.Value)),
@ -159,7 +137,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
Anchor = Anchor,
Origin = Anchor,
RelativeSizeAxes = Axes.Y,
CornerRadius = 5,
CornerRadius = 4,
Masking = true,
Child = new Box
{
@ -249,8 +227,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
if (active)
colour = colour.Lighten(0.3f);
this.FadeColour(colour, 400, Easing.OutQuint);
handle.ResizeWidthTo(active ? 20 : 10, 400, Easing.OutElasticHalf);
handle.FadeColour(colour, 400, Easing.OutQuint);
handle.ResizeWidthTo(active ? 10 : 8, 400, Easing.OutElasticHalf);
}
}
}

8
osu.Game/Screens/Edit/Compose/ComposeScreen.cs
View File

@ -75,7 +75,13 @@ namespace osu.Game.Screens.Edit.Compose
Children = new Drawable[]
{
new TimelineBlueprintContainer(composer),
new TimelineBreakDisplay { RelativeSizeAxes = Axes.Both, },
new TimelineBreakDisplay
{
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Height = 0.75f,
},
}
});
}