h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 17:47:29 +08:00
Code Issues Releases Wiki Activity

Merge branch 'editor-setup-sections-container' into editor-setup-screen-difficulty-adjust

Browse Source
This commit is contained in:
Dean Herbert 2020-10-06 19:30:32 +09:00
commit 87d4e86cad
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Edit/Setup/MetadataSection.cs
View File

@ -20,7 +20,7 @@ namespace osu.Game.Screens.Edit.Setup
[BackgroundDependencyLoader]
private void load()
{
Flow.Children = new Drawable[]
Children = new Drawable[]
{
new OsuSpriteText
{
@ -52,7 +52,7 @@ namespace osu.Game.Screens.Edit.Setup
},
};
foreach (var item in Flow.OfType<LabelledTextBox>())
foreach (var item in Children.OfType<LabelledTextBox>())
item.OnCommit += onCommit;
}

2
osu.Game/Screens/Edit/Setup/ResourcesSection.cs
View File

@ -53,7 +53,7 @@ namespace osu.Game.Screens.Edit.Setup
AutoSizeAxes = Axes.Y,
};
Flow.Children = new Drawable[]
Children = new Drawable[]
{
backgroundSpriteContainer = new Container
{

7
osu.Game/Screens/Edit/Setup/SetupSection.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
@ -14,7 +13,7 @@ namespace osu.Game.Screens.Edit.Setup
{
internal class SetupSection : Container
{
protected FillFlowContainer Flow;
private readonly FillFlowContainer flow;
[Resolved]
protected OsuColour Colours { get; private set; }
@ -22,7 +21,7 @@ namespace osu.Game.Screens.Edit.Setup
[Resolved]
protected IBindable<WorkingBeatmap> Beatmap { get; private set; }
public override void Add(Drawable drawable) => throw new InvalidOperationException("Use Flow.Add instead");
protected override Container<Drawable> Content => flow;
public SetupSection()
{
@ -31,7 +30,7 @@ namespace osu.Game.Screens.Edit.Setup
Padding = new MarginPadding(10);
InternalChild = Flow = new FillFlowContainer
InternalChild = flow = new FillFlowContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,