sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 14:17:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update screen padding and colouring to better match new designs

Browse Source
This commit is contained in:
Dean Herbert
2022-05-24 16:15:24 +09:00
parent a2bfd0ba41
commit 17206bbebf
4 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
osu.Game/Screens/Edit/Timing/TimingScreen.cs
View File

@ -16,7 +16,7 @@ using osuTK;
namespace osu.Game.Screens.Edit.Timing
{
public class TimingScreen : EditorRoundedScreen
public class TimingScreen : EditorScreenWithTimeline
{
[Cached]
private Bindable<ControlPointGroup> selectedGroup = new Bindable<ControlPointGroup>();
@ -26,27 +26,23 @@ namespace osu.Game.Screens.Edit.Timing
{
}
[BackgroundDependencyLoader]
private void load()
protected override Drawable CreateMainContent() => new GridContainer
{
Add(new GridContainer
RelativeSizeAxes = Axes.Both,
ColumnDimensions = new[]
{
RelativeSizeAxes = Axes.Both,
ColumnDimensions = new[]
new Dimension(),
new Dimension(GridSizeMode.Absolute, 350),
},
Content = new[]
{
new Drawable[]
{
new Dimension(),
new Dimension(GridSizeMode.Absolute, 350),
new ControlPointList(),
new ControlPointSettings(),
},
Content = new[]
{
new Drawable[]
{
new ControlPointList(),
new ControlPointSettings(),
},
}
});
}
}
};
public class ControlPointList : CompositeDrawable
{
@ -77,12 +73,12 @@ namespace osu.Game.Screens.Edit.Timing
{
new Box
{
Colour = colours.Background3,
Colour = colours.Background4,
RelativeSizeAxes = Axes.Both,
},
new Box
{
Colour = colours.Background2,
Colour = colours.Background3,
RelativeSizeAxes = Axes.Y,
Width = ControlPointTable.TIMING_COLUMN_WIDTH + margins,
},