RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-11 00:29:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix namespaces and class names

Browse Source
This commit is contained in:
Dean Herbert 2017-06-05 16:47:42 +09:00
parent c3c56820fa
commit af6f8bbd89
11 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Desktop.VisualTests/Tests/TestCaseReplaySettingsOverlay.cs
View File

@ -4,6 +4,7 @@
using osu.Framework.Graphics;
using osu.Framework.Testing;
using osu.Game.Graphics.UserInterface;
using osu.Game.Screens.Play;
using osu.Game.Screens.Play.ReplaySettings;
namespace osu.Desktop.VisualTests.Tests
@ -32,7 +33,7 @@ namespace osu.Desktop.VisualTests.Tests
Text = @"Button",
}));
AddStep(@"Add checkbox", () => container.Add(new ReplaySettingsCheckbox
AddStep(@"Add checkbox", () => container.Add(new ReplayCheckbox
{
LabelText = "Checkbox",
}));
@ -46,7 +47,7 @@ namespace osu.Desktop.VisualTests.Tests
}));
}
private class ExampleContainer : ReplaySettingsGroup
private class ExampleContainer : ReplayGroup
{
protected override string Title => @"example";
}

1
osu.Game/Screens/Play/HUDOverlay.cs
View File

@ -14,7 +14,6 @@ using osu.Game.Rulesets.Scoring;
using osu.Game.Rulesets.UI;
using osu.Game.Screens.Play.HUD;
using OpenTK.Input;
using osu.Game.Screens.Play.ReplaySettings;
namespace osu.Game.Screens.Play
{

2
osu.Game/Screens/Play/ReplaySettings/CollectionSettings.cs
View File

@ -9,7 +9,7 @@ using System.Collections.Generic;
namespace osu.Game.Screens.Play.ReplaySettings
{
public class CollectionSettings : ReplaySettingsGroup
public class CollectionSettings : ReplayGroup
{
protected override string Title => @"collections";

4
osu.Game/Screens/Play/ReplaySettings/DiscussionSettings.cs
View File

@ -8,7 +8,7 @@ using osu.Game.Graphics.UserInterface;
namespace osu.Game.Screens.Play.ReplaySettings
{
public class DiscussionSettings : ReplaySettingsGroup
public class DiscussionSettings : ReplayGroup
{
protected override string Title => @"discussions";
@ -17,7 +17,7 @@ namespace osu.Game.Screens.Play.ReplaySettings
{
Children = new Drawable[]
{
new ReplaySettingsCheckbox
new ReplayCheckbox
{
LabelText = "Show floating comments",
Bindable = config.GetBindable<bool>(OsuSetting.FloatingComments)

4
osu.Game/Screens/Play/ReplaySettings/PlaybackSettings.cs
View File

@ -7,7 +7,7 @@ using osu.Framework.Graphics;
namespace osu.Game.Screens.Play.ReplaySettings
{
public class PlaybackSettings : ReplaySettingsGroup
public class PlaybackSettings : ReplayGroup
{
protected override string Title => @"playback";
@ -16,7 +16,7 @@ namespace osu.Game.Screens.Play.ReplaySettings
{
Children = new Drawable[]
{
new ReplaySettingsSliderBar<double>()
new ReplaySliderBar<double>()
{
LabelText = "Playback speed",
Bindable = config.GetBindable<double>(OsuSetting.PlaybackSpeed)

2
osu.Game/Screens/Play/ReplaySettings/ReplaySettingsCheckbox.cs → osu.Game/Screens/Play/ReplaySettings/ReplayCheckbox.cs
View File

@ -7,7 +7,7 @@ using osu.Game.Graphics.UserInterface;
namespace osu.Game.Screens.Play.ReplaySettings
{
public class ReplaySettingsCheckbox : OsuCheckbox
public class ReplayCheckbox : OsuCheckbox
{
[BackgroundDependencyLoader]
private void load(OsuColour colours)

4
osu.Game/Screens/Play/ReplaySettings/ReplaySettingsGroup.cs → osu.Game/Screens/Play/ReplaySettings/ReplayGroup.cs
View File

@ -13,7 +13,7 @@ using osu.Game.Graphics.UserInterface;
namespace osu.Game.Screens.Play.ReplaySettings
{
public abstract class ReplaySettingsGroup : Container
public abstract class ReplayGroup : Container
{
/// <summary>
/// The title to be displayed in the header of this group.
@ -33,7 +33,7 @@ namespace osu.Game.Screens.Play.ReplaySettings
private Color4 buttonActiveColour;
protected ReplaySettingsGroup()
protected ReplayGroup()
{
AutoSizeAxes = Axes.Y;
Width = container_width;

2
osu.Game/Screens/Play/ReplaySettings/ReplaySettingsSliderBar.cs → osu.Game/Screens/Play/ReplaySettings/ReplaySliderBar.cs
View File

@ -10,7 +10,7 @@ using osu.Game.Overlays.Settings;
namespace osu.Game.Screens.Play.ReplaySettings
{
public class ReplaySettingsSliderBar<T> : SettingsSlider<T>
public class ReplaySliderBar<T> : SettingsSlider<T>
where T : struct, IEquatable<T>
{
protected override Drawable CreateControl() => new Sliderbar()

5
osu.Game/Screens/Play/ReplaySettings/ReplaySettingsOverlay.cs → osu.Game/Screens/Play/ReplaySettingsOverlay.cs
View File

@ -1,11 +1,12 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using OpenTK;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Screens.Play.ReplaySettings;
using OpenTK;
namespace osu.Game.Screens.Play.ReplaySettings
namespace osu.Game.Screens.Play
{
public class ReplaySettingsOverlay : FillFlowContainer
{

3
osu.Game/Screens/Play/StandardHUDOverlay.cs
View File

@ -8,7 +8,6 @@ using osu.Game.Graphics.UserInterface;
using osu.Game.Rulesets.Scoring;
using osu.Game.Screens.Play.HUD;
using OpenTK;
using osu.Game.Screens.Play.ReplaySettings;
namespace osu.Game.Screens.Play
{
@ -46,7 +45,7 @@ namespace osu.Game.Screens.Play
Anchor = Anchor.BottomRight,
Origin = Anchor.BottomRight,
Margin = new MarginPadding(10),
Y = - TwoLayerButton.SIZE_RETRACTED.Y,
Y = -TwoLayerButton.SIZE_RETRACTED.Y,
};
protected override ScoreCounter CreateScoreCounter() => new ScoreCounter(6)

8
osu.Game/osu.Game.csproj
View File

@ -244,11 +244,11 @@
<Compile Include="Screens\Play\HotkeyRetryOverlay.cs" />
<Compile Include="Screens\Play\ReplaySettings\CollectionSettings.cs" />
<Compile Include="Screens\Play\ReplaySettings\DiscussionSettings.cs" />
<Compile Include="Screens\Play\ReplaySettings\ReplaySettingsGroup.cs" />
<Compile Include="Screens\Play\ReplaySettings\ReplaySettingsOverlay.cs" />
<Compile Include="Screens\Play\ReplaySettings\ReplaySettingsSliderBar.cs" />
<Compile Include="Screens\Play\ReplaySettings\ReplayGroup.cs" />
<Compile Include="Screens\Play\ReplaySettingsOverlay.cs" />
<Compile Include="Screens\Play\ReplaySettings\ReplaySliderBar.cs" />
<Compile Include="Screens\Play\ReplaySettings\PlaybackSettings.cs" />
<Compile Include="Screens\Play\ReplaySettings\ReplaySettingsCheckbox.cs" />
<Compile Include="Screens\Play\ReplaySettings\ReplayCheckbox.cs" />
<Compile Include="Screens\Play\PauseContainer.cs" />
<Compile Include="Screens\Play\SongProgressInfo.cs" />
<Compile Include="Screens\Play\HUD\ModDisplay.cs" />