Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Display breaks on editor timeline & allow manually adjusting their duration #28523

Merged
merged 4 commits into from
Jun 19, 2024

Conversation

bdach
Copy link
Collaborator

@bdach bdach commented Jun 18, 2024

First step for #14330

2024-06-18.16-35-27.mp4

This is a half-baked diff:

  • No way to add breaks
  • Breaks don't add automatically
  • Undo doesn't work properly

but the code size has already grown by quite a bit so I wanna get this one out as a first step at least. Aforementioned points will be addressed in future pulls.

@bdach bdach self-assigned this Jun 19, 2024
@peppy peppy self-requested a review June 19, 2024 12:22
@peppy peppy merged commit 32a7885 into ppy:master Jun 19, 2024
8 of 11 checks passed
@bdach bdach deleted the break-display-and-adjustment branch June 19, 2024 12:50
@@ -204,12 +204,12 @@ private void updateState()
{
bool active = IsHovered || IsDragged;

var colour = colours.GreyCarmineLighter;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uh... sure about this? This colour was matching bottom timeline:

private partial class BreakVisualisation : DurationVisualisation
{
public BreakVisualisation(BreakPeriod breakPeriod)
: base(breakPeriod.StartTime, breakPeriod.EndTime)
{
}
[BackgroundDependencyLoader]
private void load(OsuColour colours) => Colour = colours.GreyCarmineLight;
}

Purple is kiai.

Colour = effect.GetRepresentingColour(colours).Darken(0.5f),

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants