h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-04 00:02:54 +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

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

@ -11,60 +11,63 @@ 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
{ {
protected override DropdownHeader CreateHeader() => new CollectionsHeader { AccentColour = AccentColour }; public class CollectionsDropdown<T> : OsuDropdown<T>
protected override Menu CreateMenu() => new CollectionsMenu();
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{ {
AccentColour = colours.Gray6; protected override DropdownHeader CreateHeader() => new CollectionsHeader { AccentColour = AccentColour };
} protected override Menu CreateMenu() => new CollectionsMenu();
private class CollectionsHeader : OsuDropdownHeader
{
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
BackgroundColour = colours.Gray4; AccentColour = colours.Gray6;
} }
public CollectionsHeader() private class CollectionsHeader : OsuDropdownHeader
{ {
CornerRadius = 5; [BackgroundDependencyLoader]
Height = 30; private void load(OsuColour colours)
Icon.TextSize = 14;
Icon.Margin = new MarginPadding(0);
Foreground.Padding = new MarginPadding { Top = 4, Bottom = 4, Left = 10, Right = 10 };
EdgeEffect = new EdgeEffect
{ {
Type = EdgeEffectType.Shadow, BackgroundColour = colours.Gray4;
Colour = Color4.Black.Opacity(0.3f), }
Radius = 3,
Offset = new Vector2(0f, 1f), public CollectionsHeader()
}; {
CornerRadius = 5;
Height = 30;
Icon.TextSize = 14;
Icon.Margin = new MarginPadding(0);
Foreground.Padding = new MarginPadding { Top = 4, Bottom = 4, Left = 10, Right = 10 };
EdgeEffect = new EdgeEffect
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(0.3f),
Radius = 3,
Offset = new Vector2(0f, 1f),
};
}
}
private class CollectionsMenu : OsuMenu
{
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
Background.Colour = colours.Gray4;
}
public CollectionsMenu()
{
CornerRadius = 5;
EdgeEffect = new EdgeEffect
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(0.3f),
Radius = 3,
Offset = new Vector2(0f, 1f),
};
}
} }
} }
}
private class CollectionsMenu : OsuMenu
{
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
Background.Colour = colours.Gray4;
}
public CollectionsMenu()
{
CornerRadius = 5;
EdgeEffect = new EdgeEffect
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(0.3f),
Radius = 3,
Offset = new Vector2(0f, 1f),
};
}
}
}

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;

60
osu.Game/Screens/Play/Options/DiscussionOptions.cs
View File

@ -1,33 +1,33 @@
// 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.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Configuration; using osu.Game.Configuration;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Overlays.Settings; using osu.Game.Overlays.Settings;
namespace osu.Game.Screens.Play.Options namespace osu.Game.Screens.Play.Options
{ {
public class DiscussionOptions : OptionContainer public class DiscussionOptions : OptionContainer
{ {
public override string Title => @"DISCUSSIONS"; public override string Title => @"DISCUSSIONS";
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuConfigManager config) private void load(OsuConfigManager config)
{ {
Add(new SettingsCheckbox Add(new SettingsCheckbox
{ {
LabelText = "Show floating coments", LabelText = "Show floating coments",
Bindable = config.GetBindable<bool>(OsuSetting.FloatingComments) Bindable = config.GetBindable<bool>(OsuSetting.FloatingComments)
}); });
Add(new FocusedTextBox Add(new FocusedTextBox
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Height = 30, Height = 30,
PlaceholderText = "Add Comment", PlaceholderText = "Add Comment",
HoldFocus = false, HoldFocus = false,
}); });
} }
} }
} }

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,