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

CI fixes

Browse Source
This commit is contained in:
EVAST9919 2017-05-17 17:14:09 +03:00
parent eec813ad65
commit a21343da23
5 changed files with 81 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Desktop.VisualTests/Tests/TestCaseOptionsContainer.cs
View File

@ -1,11 +1,8 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Testing; using osu.Framework.Testing;
using osu.Game.Overlays;
using osu.Game.Screens.Play.Options; using osu.Game.Screens.Play.Options;
namespace osu.Desktop.VisualTests.Tests namespace osu.Desktop.VisualTests.Tests

5
osu.Game/Overlays/Music/CollectionsDropdown.cs
View File

@ -11,8 +11,10 @@ using osu.Framework.Graphics.UserInterface;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
public class CollectionsDropdown<T> : OsuDropdown<T> namespace osu.Game.Overlays.Music
{ {
public class CollectionsDropdown<T> : OsuDropdown<T>
{
protected override DropdownHeader CreateHeader() => new CollectionsHeader { AccentColour = AccentColour }; protected override DropdownHeader CreateHeader() => new CollectionsHeader { AccentColour = AccentColour };
protected override Menu CreateMenu() => new CollectionsMenu(); protected override Menu CreateMenu() => new CollectionsMenu();
@ -67,4 +69,5 @@ public class CollectionsDropdown<T> : OsuDropdown<T>
}; };
} }
} }
}
} }

1
osu.Game/Screens/Play/Options/CollectionOptions.cs
View File

@ -3,7 +3,6 @@
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Configuration;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Overlays.Music; using osu.Game.Overlays.Music;
using System.Collections.Generic; using System.Collections.Generic;

7
osu.Game/Screens/Play/Options/OptionContainer.cs
View File

@ -19,10 +19,9 @@ namespace osu.Game.Screens.Play.Options
/// </summary> /// </summary>
public abstract string Title { get; } public abstract string Title { get; }
private Container header; private readonly FillFlowContainer content;
private FillFlowContainer content;
public OptionContainer() protected OptionContainer()
{ {
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;
Width = 250; Width = 250;
@ -47,7 +46,7 @@ namespace osu.Game.Screens.Play.Options
Children = new Drawable[] Children = new Drawable[]
{ {
header = new Container new Container
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Height = 30, Height = 30,