1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 15:33:05 +08:00

Update metrics of checkboxes and backgrounds to match design better

This commit is contained in:
Dean Herbert 2023-07-14 14:24:40 +09:00
parent 1dc293ed61
commit 01750dd091

View File

@ -39,11 +39,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = colourProvider.Background5
},
new GridContainer new GridContainer
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
@ -76,24 +71,23 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
}, },
new FillFlowContainer new FillFlowContainer
{ {
AutoSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Both,
Width = 160,
Padding = new MarginPadding(10), Padding = new MarginPadding(10),
Direction = FillDirection.Vertical, Direction = FillDirection.Vertical,
Spacing = new Vector2(0, 4), Spacing = new Vector2(0, 4),
Children = new[] Children = new[]
{ {
waveformCheckbox = new OsuCheckbox waveformCheckbox = new OsuCheckbox(nubSize: 30f)
{ {
LabelText = EditorStrings.TimelineWaveform, LabelText = EditorStrings.TimelineWaveform,
Current = { Value = true }, Current = { Value = true },
}, },
ticksCheckbox = new OsuCheckbox ticksCheckbox = new OsuCheckbox(nubSize: 30f)
{ {
LabelText = EditorStrings.TimelineTicks, LabelText = EditorStrings.TimelineTicks,
Current = { Value = true }, Current = { Value = true },
}, },
controlPointsCheckbox = new OsuCheckbox controlPointsCheckbox = new OsuCheckbox(nubSize: 30f)
{ {
LabelText = BeatmapsetsStrings.ShowStatsBpm, LabelText = BeatmapsetsStrings.ShowStatsBpm,
Current = { Value = true }, Current = { Value = true },
@ -102,7 +96,21 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
} }
} }
}, },
Timeline = new Timeline(userContent), new Container
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Depth = float.MaxValue,
Colour = colourProvider.Background5
},
Timeline = new Timeline(userContent),
}
},
new Container new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,