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

Integrate into editor's compose screen

Browse Source
This commit is contained in:
smoogipoo 2018-03-19 20:14:46 +09:00
parent 32fecc6ff4
commit b25c564ecb
4 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Visual/TestCaseBeatSnapVisualiser.cs
View File

@ -6,6 +6,7 @@ using System.Collections.Generic;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Game.Screens.Edit.Screens.Compose.BeatSnap;
using OpenTK;
namespace osu.Game.Tests.Visual
{
@ -24,7 +25,8 @@ namespace osu.Game.Tests.Visual
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Y = -200
Y = -200,
Size = new Vector2(100, 110)
};
}
}

3
osu.Game.Tests/Visual/TestCaseEditorCompose.cs
View File

@ -2,6 +2,7 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Collections.Generic;
using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Game.Beatmaps;
@ -12,6 +13,8 @@ namespace osu.Game.Tests.Visual
[TestFixture]
public class TestCaseEditorCompose : OsuTestCase
{
public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(Compose) };
private readonly Random random;
private readonly Compose compose;

1
osu.Game/Screens/Edit/Screens/Compose/BeatSnap/BeatSnapVisualiser.cs
View File

@ -27,7 +27,6 @@ namespace osu.Game.Screens.Edit.Screens.Compose.BeatSnap
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
Size = new Vector2(100, 110);
Masking = true;
CornerRadius = 5;

26
osu.Game/Screens/Edit/Screens/Compose/Compose.cs
View File

@ -8,6 +8,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Logging;
using osu.Game.Beatmaps;
using osu.Game.Screens.Edit.Screens.Compose.BeatSnap;
using osu.Game.Screens.Edit.Screens.Compose.Timeline;
namespace osu.Game.Screens.Edit.Screens.Compose
@ -47,15 +48,28 @@ namespace osu.Game.Screens.Edit.Screens.Compose
Name = "Timeline content",
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Horizontal = horizontal_margins, Vertical = vertical_margins },
Children = new Drawable[]
Child = new GridContainer
{
new Container
RelativeSizeAxes = Axes.Both,
Content = new[]
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Right = 115 },
Child = timeline = new ScrollableTimeline { RelativeSizeAxes = Axes.Both }
new Drawable[]
{
new Container
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Right = 5 },
Child = timeline = new ScrollableTimeline { RelativeSizeAxes = Axes.Both }
},
new BeatSnapVisualiser { RelativeSizeAxes = Axes.Both }
},
},
ColumnDimensions = new[]
{
new Dimension(),
new Dimension(GridSizeMode.Absolute, 90),
}
}
},
}
}
}