RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-28 09:52:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust timeline centre marker visuals and bring in front of ticks

Browse Source
This commit is contained in:
Dean Herbert 2024-07-12 16:26:38 +09:00
parent f65ab6736d
commit ca2fc72959
No known key found for this signature in database
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,10 +3,12 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Game.Overlays;
using osuTK;
using osuTK.Graphics;
namespace osu.Game.Screens.Edit.Compose.Components.Timeline
{
@ -23,7 +25,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
Anchor = Anchor.TopCentre;
Origin = Anchor.TopCentre;
}
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colours)
{
InternalChildren = new Drawable[]
{
new Box
@ -32,21 +38,18 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Y,
Width = bar_width,
Blending = BlendingParameters.Additive,
Colour = ColourInfo.GradientVertical(colours.Colour2, Color4.Black),
},
new Triangle
{
Anchor = Anchor.TopCentre,
Origin = Anchor.BottomCentre,
Size = new Vector2(triangle_width, triangle_width * 0.8f),
Scale = new Vector2(1, -1)
Scale = new Vector2(1, -1),
Colour = colours.Colour2,
},
};
}
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colours)
{
Colour = colours.Highlight1;
}
}
}

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

@ -125,8 +125,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
MidColour = colours.BlueDark,
HighColour = colours.BlueDarker,
},
centreMarker.CreateProxy(),
ticks.CreateProxy(),
centreMarker.CreateProxy(),
new Box
{
Name = "zero marker",