sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-30 01:47:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Simplify content creation of Timeline / TimelineArea

Browse Source
This commit is contained in:
Dean Herbert 2021-04-14 20:55:12 +09:00
parent be08b9d1ef
commit d1c68cb92b
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
[Cached] [Cached]
public class Timeline : ZoomableScrollContainer, IPositionSnapProvider public class Timeline : ZoomableScrollContainer, IPositionSnapProvider
{ {
private readonly Drawable userContent;
public readonly Bindable<bool> WaveformVisible = new Bindable<bool>(); public readonly Bindable<bool> WaveformVisible = new Bindable<bool>();
public readonly Bindable<bool> ControlPointsVisible = new Bindable<bool>(); public readonly Bindable<bool> ControlPointsVisible = new Bindable<bool>();
@ -57,10 +58,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
private Track track; private Track track;
private const float timeline_height = 72; private const float timeline_height = 72;
private const float timeline_expanded_height = 150; private const float timeline_expanded_height = 156;
public Timeline() public Timeline(Drawable userContent)
{ {
this.userContent = userContent;
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
ZoomDuration = 200; ZoomDuration = 200;
@ -118,6 +121,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Colour = colours.YellowDarker, Colour = colours.YellowDarker,
}, },
userContent,
} }
}, },
}); });

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

@ -12,11 +12,19 @@ using osuTK;
namespace osu.Game.Screens.Edit.Compose.Components.Timeline namespace osu.Game.Screens.Edit.Compose.Components.Timeline
{ {
public class TimelineArea : Container public class TimelineArea : CompositeDrawable
{ {
public readonly Timeline Timeline = new Timeline(); public Timeline Timeline;
protected override Container<Drawable> Content => Timeline; private readonly Drawable userContent;
public TimelineArea(Drawable content = null)
{
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
userContent = content ?? Drawable.Empty();
}
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
@ -122,7 +130,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
} }
} }
}, },
Timeline Timeline = new Timeline(userContent),
}, },
}, },
RowDimensions = new[] RowDimensions = new[]

10
osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
View File

@ -133,15 +133,7 @@ namespace osu.Game.Screens.Edit
mainContent.Add(content); mainContent.Add(content);
content.FadeInFromZero(300, Easing.OutQuint); content.FadeInFromZero(300, Easing.OutQuint);
LoadComponentAsync(new TimelineArea LoadComponentAsync(new TimelineArea(CreateTimelineContent()), t =>
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Children = new[]
{
CreateTimelineContent(),
}
}, t =>
{ {
timelineContainer.Add(t); timelineContainer.Add(t);
OnTimelineLoaded(t); OnTimelineLoaded(t);