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

Adjust timeline sizing to closer match designs (but not 1:1 yet)

Browse Source
This commit is contained in:
Dean Herbert 2021-04-14 20:11:16 +09:00
parent f9b1b7fe25
commit 99f05253fd
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,8 +56,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
private Track track; private Track track;
private const float timeline_height = 90; private const float timeline_height = 72;
private const float timeline_expanded_height = 180; private const float timeline_expanded_height = 150;
public Timeline() public Timeline()
{ {
@ -74,6 +74,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
private TimelineControlPointDisplay controlPoints; private TimelineControlPointDisplay controlPoints;
private Container mainContent;
private Bindable<float> waveformOpacity; private Bindable<float> waveformOpacity;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -91,11 +93,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Height = timeline_expanded_height, Height = timeline_expanded_height,
}, },
new Container mainContent = new Container
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Height = timeline_height, Height = timeline_height,
Depth = float.MaxValue, Depth = float.MaxValue,
Children = new[] Children = new[]
@ -139,6 +139,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
if (visible.NewValue) if (visible.NewValue)
{ {
this.ResizeHeightTo(timeline_expanded_height, 200, Easing.OutQuint); this.ResizeHeightTo(timeline_expanded_height, 200, Easing.OutQuint);
mainContent.MoveToY(36, 200, Easing.OutQuint);
// delay the fade in else masking looks weird. // delay the fade in else masking looks weird.
controlPoints.Delay(180).FadeIn(400, Easing.OutQuint); controlPoints.Delay(180).FadeIn(400, Easing.OutQuint);
@ -149,6 +150,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
// likewise, delay the resize until the fade is complete. // likewise, delay the resize until the fade is complete.
this.Delay(180).ResizeHeightTo(timeline_height, 200, Easing.OutQuint); this.Delay(180).ResizeHeightTo(timeline_height, 200, Easing.OutQuint);
mainContent.Delay(180).MoveToY(0, 200, Easing.OutQuint);
} }
}, true); }, true);