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

Rename to BeatmapSetOverlay

Browse Source
This commit is contained in:
Dean Herbert 2017-09-25 17:26:27 +08:00
parent b83596b44d
commit 5be11f539b
14 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Overlays/OnlineBeatmapSet/AuthorInfo.cs → osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
View File

@ -1,16 +1,16 @@
// 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 OpenTK;
using OpenTK.Graphics;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Users; using osu.Game.Users;
using OpenTK;
using OpenTK.Graphics;
namespace osu.Game.Overlays.OnlineBeatmapSet namespace osu.Game.Overlays.BeatmapSet
{ {
public class AuthorInfo : Container public class AuthorInfo : Container
{ {

4
osu.Game/Overlays/OnlineBeatmapSet/BasicStats.cs → osu.Game/Overlays/BeatmapSet/BasicStats.cs
View File

@ -2,7 +2,6 @@
// 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 System; using System;
using OpenTK;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
@ -10,8 +9,9 @@ using osu.Framework.Graphics.Cursor;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using OpenTK;
namespace osu.Game.Overlays.OnlineBeatmapSet namespace osu.Game.Overlays.BeatmapSet
{ {
public class BasicStats : Container public class BasicStats : Container
{ {

6
osu.Game/Overlays/OnlineBeatmapSet/BeatmapPicker.cs → osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs
View File

@ -3,8 +3,6 @@
using System; using System;
using System.Linq; using System.Linq;
using OpenTK;
using OpenTK.Graphics;
using osu.Framework; using osu.Framework;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Configuration; using osu.Framework.Configuration;
@ -18,8 +16,10 @@ using osu.Game.Beatmaps.Drawables;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using OpenTK;
using OpenTK.Graphics;
namespace osu.Game.Overlays.OnlineBeatmapSet namespace osu.Game.Overlays.BeatmapSet
{ {
public class BeatmapPicker : Container public class BeatmapPicker : Container
{ {

8
osu.Game/Overlays/OnlineBeatmapSet/Details.cs → osu.Game/Overlays/BeatmapSet/Details.cs
View File

@ -1,16 +1,16 @@
// 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 OpenTK;
using OpenTK.Graphics;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Screens.Select.Details; using osu.Game.Screens.Select.Details;
using OpenTK;
using OpenTK.Graphics;
namespace osu.Game.Overlays.OnlineBeatmapSet namespace osu.Game.Overlays.BeatmapSet
{ {
public class Details : FillFlowContainer public class Details : FillFlowContainer
{ {
@ -48,7 +48,7 @@ namespace osu.Game.Overlays.OnlineBeatmapSet
public Details() public Details()
{ {
Width = OnlineBeatmapSetOverlay.RIGHT_WIDTH; Width = BeatmapSetOverlay.RIGHT_WIDTH;
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;
Spacing = new Vector2(1f); Spacing = new Vector2(1f);

4
osu.Game/Overlays/OnlineBeatmapSet/DownloadButton.cs → osu.Game/Overlays/BeatmapSet/DownloadButton.cs
View File

@ -1,13 +1,13 @@
// 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 OpenTK;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using OpenTK;
namespace osu.Game.Overlays.OnlineBeatmapSet namespace osu.Game.Overlays.BeatmapSet
{ {
public class DownloadButton : HeaderButton public class DownloadButton : HeaderButton
{ {

4
osu.Game/Overlays/OnlineBeatmapSet/FavouriteButton.cs → osu.Game/Overlays/BeatmapSet/FavouriteButton.cs
View File

@ -1,15 +1,15 @@
// 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 OpenTK;
using osu.Framework.Configuration; using osu.Framework.Configuration;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Backgrounds; using osu.Game.Graphics.Backgrounds;
using OpenTK;
namespace osu.Game.Overlays.OnlineBeatmapSet namespace osu.Game.Overlays.BeatmapSet
{ {
public class FavouriteButton : HeaderButton public class FavouriteButton : HeaderButton
{ {

10
osu.Game/Overlays/OnlineBeatmapSet/Header.cs → osu.Game/Overlays/BeatmapSet/Header.cs
View File

@ -1,8 +1,6 @@
// 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 OpenTK;
using OpenTK.Graphics;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
@ -13,8 +11,10 @@ using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Drawables; using osu.Game.Beatmaps.Drawables;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using OpenTK;
using OpenTK.Graphics;
namespace osu.Game.Overlays.OnlineBeatmapSet namespace osu.Game.Overlays.BeatmapSet
{ {
public class Header : Container public class Header : Container
{ {
@ -124,7 +124,7 @@ namespace osu.Game.Overlays.OnlineBeatmapSet
new Container new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Top = 20, Bottom = 30, Horizontal = OnlineBeatmapSetOverlay.X_PADDING }, Padding = new MarginPadding { Top = 20, Bottom = 30, Horizontal = BeatmapSetOverlay.X_PADDING },
Child = new FillFlowContainer Child = new FillFlowContainer
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
@ -196,7 +196,7 @@ namespace osu.Game.Overlays.OnlineBeatmapSet
{ {
Anchor = Anchor.BottomRight, Anchor = Anchor.BottomRight,
Origin = Anchor.BottomRight, Origin = Anchor.BottomRight,
Margin = new MarginPadding { Right = OnlineBeatmapSetOverlay.X_PADDING }, Margin = new MarginPadding { Right = BeatmapSetOverlay.X_PADDING },
}, },
}, },
}, },

2
osu.Game/Overlays/OnlineBeatmapSet/HeaderButton.cs → osu.Game/Overlays/BeatmapSet/HeaderButton.cs
View File

@ -8,7 +8,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Backgrounds; using osu.Game.Graphics.Backgrounds;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
namespace osu.Game.Overlays.OnlineBeatmapSet namespace osu.Game.Overlays.BeatmapSet
{ {
public class HeaderButton : OsuClickableContainer public class HeaderButton : OsuClickableContainer
{ {

14
osu.Game/Overlays/OnlineBeatmapSet/Info.cs → osu.Game/Overlays/BeatmapSet/Info.cs
View File

@ -1,8 +1,6 @@
// 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 OpenTK;
using OpenTK.Graphics;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
@ -11,8 +9,10 @@ using osu.Framework.Graphics.Shapes;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using OpenTK;
using OpenTK.Graphics;
namespace osu.Game.Overlays.OnlineBeatmapSet namespace osu.Game.Overlays.BeatmapSet
{ {
public class Info : Container public class Info : Container
{ {
@ -67,13 +67,13 @@ namespace osu.Game.Overlays.OnlineBeatmapSet
new Container new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Top = 15, Horizontal = OnlineBeatmapSetOverlay.X_PADDING }, Padding = new MarginPadding { Top = 15, Horizontal = BeatmapSetOverlay.X_PADDING },
Children = new Drawable[] Children = new Drawable[]
{ {
new Container new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Right = metadata_width + OnlineBeatmapSetOverlay.RIGHT_WIDTH + spacing * 2 }, Padding = new MarginPadding { Right = metadata_width + BeatmapSetOverlay.RIGHT_WIDTH + spacing * 2 },
Child = new ScrollContainer Child = new ScrollContainer
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
@ -89,7 +89,7 @@ namespace osu.Game.Overlays.OnlineBeatmapSet
Width = metadata_width, Width = metadata_width,
ScrollbarVisible = false, ScrollbarVisible = false,
Padding = new MarginPadding { Horizontal = 10 }, Padding = new MarginPadding { Horizontal = 10 },
Margin = new MarginPadding { Right = OnlineBeatmapSetOverlay.RIGHT_WIDTH + spacing }, Margin = new MarginPadding { Right = BeatmapSetOverlay.RIGHT_WIDTH + spacing },
Child = new FillFlowContainer Child = new FillFlowContainer
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
@ -108,7 +108,7 @@ namespace osu.Game.Overlays.OnlineBeatmapSet
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
Width = OnlineBeatmapSetOverlay.RIGHT_WIDTH, Width = BeatmapSetOverlay.RIGHT_WIDTH,
Children = new Drawable[] Children = new Drawable[]
{ {
successRateBackground = new Box successRateBackground = new Box

6
osu.Game/Overlays/OnlineBeatmapSet/PreviewButton.cs → osu.Game/Overlays/BeatmapSet/PreviewButton.cs
View File

@ -1,8 +1,6 @@
// 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 OpenTK;
using OpenTK.Graphics;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Audio; using osu.Framework.Audio;
using osu.Framework.Audio.Track; using osu.Framework.Audio.Track;
@ -15,8 +13,10 @@ using osu.Game.Beatmaps;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using OpenTK;
using OpenTK.Graphics;
namespace osu.Game.Overlays.OnlineBeatmapSet namespace osu.Game.Overlays.BeatmapSet
{ {
public class PreviewButton : OsuClickableContainer public class PreviewButton : OsuClickableContainer
{ {

6
osu.Game/Overlays/OnlineBeatmapSet/SuccessRate.cs → osu.Game/Overlays/BeatmapSet/SuccessRate.cs
View File

@ -1,17 +1,17 @@
// 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 System;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Beatmaps;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Beatmaps;
using osu.Game.Screens.Select.Details; using osu.Game.Screens.Select.Details;
using System;
namespace osu.Game.Overlays.OnlineBeatmapSet namespace osu.Game.Overlays.BeatmapSet
{ {
public class SuccessRate : Container public class SuccessRate : Container
{ {

6
osu.Game/Overlays/OnlineBeatmapSetOverlay.cs → osu.Game/Overlays/BeatmapSetOverlay.cs
View File

@ -10,11 +10,11 @@ using osu.Framework.Graphics.Shapes;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Overlays.OnlineBeatmapSet; using osu.Game.Overlays.BeatmapSet;
namespace osu.Game.Overlays namespace osu.Game.Overlays
{ {
public class OnlineBeatmapSetOverlay : WaveOverlayContainer public class BeatmapSetOverlay : WaveOverlayContainer
{ {
public const float X_PADDING = 40; public const float X_PADDING = 40;
public const float RIGHT_WIDTH = 275; public const float RIGHT_WIDTH = 275;
@ -22,7 +22,7 @@ namespace osu.Game.Overlays
private readonly Header header; private readonly Header header;
private readonly Info info; private readonly Info info;
public OnlineBeatmapSetOverlay() public BeatmapSetOverlay()
{ {
FirstWaveColour = OsuColour.Gray(0.4f); FirstWaveColour = OsuColour.Gray(0.4f);
SecondWaveColour = OsuColour.Gray(0.3f); SecondWaveColour = OsuColour.Gray(0.3f);

8
osu.Game/Tests/Visual/TestCaseOnlineBeatmapSetOverlay.cs → osu.Game/Tests/Visual/TestCaseBeatmapSetOverlay.cs
View File

@ -12,15 +12,15 @@ using osu.Game.Users;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual
{ {
internal class TestCaseOnlineBeatmapSetOverlay : OsuTestCase internal class TestCaseBeatmapSetOverlay : OsuTestCase
{ {
public override string Description => @"view online beatmap sets"; public override string Description => @"view online beatmap sets";
private readonly OnlineBeatmapSetOverlay overlay; private readonly BeatmapSetOverlay overlay;
public TestCaseOnlineBeatmapSetOverlay() public TestCaseBeatmapSetOverlay()
{ {
Add(overlay = new OnlineBeatmapSetOverlay()); Add(overlay = new BeatmapSetOverlay());
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]

26
osu.Game/osu.Game.csproj
View File

@ -774,19 +774,19 @@
<Compile Include="Users\UserPanel.cs" /> <Compile Include="Users\UserPanel.cs" />
<Compile Include="Users\UserStatistics.cs" /> <Compile Include="Users\UserStatistics.cs" />
<Compile Include="Users\UserStatus.cs" /> <Compile Include="Users\UserStatus.cs" />
<Compile Include="Overlays\OnlineBeatmapSetOverlay.cs" /> <Compile Include="Overlays\BeatmapSetOverlay.cs" />
<Compile Include="Overlays\OnlineBeatmapSet\Info.cs" /> <Compile Include="Overlays\BeatmapSet\Info.cs" />
<Compile Include="Overlays\OnlineBeatmapSet\Header.cs" /> <Compile Include="Overlays\BeatmapSet\Header.cs" />
<Compile Include="Overlays\OnlineBeatmapSet\AuthorInfo.cs" /> <Compile Include="Overlays\BeatmapSet\AuthorInfo.cs" />
<Compile Include="Overlays\OnlineBeatmapSet\BeatmapPicker.cs" /> <Compile Include="Overlays\BeatmapSet\BeatmapPicker.cs" />
<Compile Include="Overlays\OnlineBeatmapSet\HeaderButton.cs" /> <Compile Include="Overlays\BeatmapSet\HeaderButton.cs" />
<Compile Include="Overlays\OnlineBeatmapSet\Details.cs" /> <Compile Include="Overlays\BeatmapSet\Details.cs" />
<Compile Include="Overlays\OnlineBeatmapSet\FavouriteButton.cs" /> <Compile Include="Overlays\BeatmapSet\FavouriteButton.cs" />
<Compile Include="Overlays\OnlineBeatmapSet\DownloadButton.cs" /> <Compile Include="Overlays\BeatmapSet\DownloadButton.cs" />
<Compile Include="Overlays\OnlineBeatmapSet\BasicStats.cs" /> <Compile Include="Overlays\BeatmapSet\BasicStats.cs" />
<Compile Include="Overlays\OnlineBeatmapSet\SuccessRate.cs" /> <Compile Include="Overlays\BeatmapSet\SuccessRate.cs" />
<Compile Include="Overlays\OnlineBeatmapSet\PreviewButton.cs" /> <Compile Include="Overlays\BeatmapSet\PreviewButton.cs" />
<Compile Include="Tests\Visual\TestCaseOnlineBeatmapSetOverlay.cs" /> <Compile Include="Tests\Visual\TestCaseBeatmapSetOverlay.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="lazer.ico" /> <EmbeddedResource Include="lazer.ico" />