h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 13:22:55 +08:00
Code Issues Releases Wiki Activity

PlayerGroup -> PlayerSettingsGroup

Browse Source
This commit is contained in:
TocoToucan 2018-01-15 20:52:52 +03:00
parent 6e35484160
commit a81f32a388
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/TestCaseReplaySettingsOverlay.cs
View File

@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual
})); }));
} }
private class ExampleContainer : PlayerGroup private class ExampleContainer : PlayerSettingsGroup
{ {
protected override string Title => @"example"; protected override string Title => @"example";
} }

2
osu.Game/Rulesets/Edit/ToolboxGroup.cs
View File

@ -6,7 +6,7 @@ using osu.Game.Screens.Play.PlayerSettings;
namespace osu.Game.Rulesets.Edit namespace osu.Game.Rulesets.Edit
{ {
public class ToolboxGroup : PlayerGroup public class ToolboxGroup : PlayerSettingsGroup
{ {
protected override string Title => "toolbox"; protected override string Title => "toolbox";

4
osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
View File

@ -26,7 +26,7 @@ namespace osu.Game.Screens.Play.HUD
AlwaysPresent = true; AlwaysPresent = true;
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
Child = new FillFlowContainer<PlayerGroup> Child = new FillFlowContainer<PlayerSettingsGroup>
{ {
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
@ -34,7 +34,7 @@ namespace osu.Game.Screens.Play.HUD
Direction = FillDirection.Vertical, Direction = FillDirection.Vertical,
Spacing = new Vector2(0, 20), Spacing = new Vector2(0, 20),
Margin = new MarginPadding { Top = 100, Right = 10 }, Margin = new MarginPadding { Top = 100, Right = 10 },
Children = new PlayerGroup[] Children = new PlayerSettingsGroup[]
{ {
//CollectionSettings = new CollectionSettings(), //CollectionSettings = new CollectionSettings(),
//DiscussionSettings = new DiscussionSettings(), //DiscussionSettings = new DiscussionSettings(),

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

@ -9,7 +9,7 @@ using osu.Game.Overlays.Music;
namespace osu.Game.Screens.Play.PlayerSettings namespace osu.Game.Screens.Play.PlayerSettings
{ {
public class CollectionSettings : PlayerGroup public class CollectionSettings : PlayerSettingsGroup
{ {
protected override string Title => @"collections"; protected override string Title => @"collections";

2
osu.Game/Screens/Play/PlayerSettings/DiscussionSettings.cs
View File

@ -8,7 +8,7 @@ using osu.Game.Graphics.UserInterface;
namespace osu.Game.Screens.Play.PlayerSettings namespace osu.Game.Screens.Play.PlayerSettings
{ {
public class DiscussionSettings : PlayerGroup public class DiscussionSettings : PlayerSettingsGroup
{ {
protected override string Title => @"discussions"; protected override string Title => @"discussions";

2
osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs
View File

@ -9,7 +9,7 @@ using osu.Game.Graphics.Sprites;
namespace osu.Game.Screens.Play.PlayerSettings namespace osu.Game.Screens.Play.PlayerSettings
{ {
public class PlaybackSettings : PlayerGroup public class PlaybackSettings : PlayerSettingsGroup
{ {
private const int padding = 10; private const int padding = 10;

4
osu.Game/Screens/Play/PlayerSettings/PlayerGroup.cs → osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
View File

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

2
osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
View File

@ -11,7 +11,7 @@ using osu.Game.Graphics.Sprites;
namespace osu.Game.Screens.Play.PlayerSettings namespace osu.Game.Screens.Play.PlayerSettings
{ {
public class VisualSettings : PlayerGroup public class VisualSettings : PlayerSettingsGroup
{ {
protected override string Title => "Visual settings"; protected override string Title => "Visual settings";

4
osu.Game/osu.Game.csproj
View File

@ -756,7 +756,7 @@
<Compile Include="Screens\Play\PlayerSettings\DiscussionSettings.cs" /> <Compile Include="Screens\Play\PlayerSettings\DiscussionSettings.cs" />
<Compile Include="Screens\Play\PlayerSettings\PlaybackSettings.cs" /> <Compile Include="Screens\Play\PlayerSettings\PlaybackSettings.cs" />
<Compile Include="Screens\Play\PlayerSettings\PlayerCheckbox.cs" /> <Compile Include="Screens\Play\PlayerSettings\PlayerCheckbox.cs" />
<Compile Include="Screens\Play\PlayerSettings\PlayerGroup.cs" /> <Compile Include="Screens\Play\PlayerSettings\PlayerSettingsGroup.cs" />
<Compile Include="Screens\Play\PlayerSettings\PlayerSliderBar.cs" /> <Compile Include="Screens\Play\PlayerSettings\PlayerSliderBar.cs" />
<Compile Include="Screens\Play\SkipButton.cs" /> <Compile Include="Screens\Play\SkipButton.cs" />
<Compile Include="Screens\Play\SongProgress.cs" /> <Compile Include="Screens\Play\SongProgress.cs" />
@ -889,4 +889,4 @@
<Import Project="$(SolutionDir)\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.8\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets" Condition="Exists('$(SolutionDir)\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.8\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" /> <Import Project="$(SolutionDir)\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.8\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets" Condition="Exists('$(SolutionDir)\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.8\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" />
<Import Project="$(SolutionDir)\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.8\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets" Condition="Exists('$(SolutionDir)\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.8\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" /> <Import Project="$(SolutionDir)\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.8\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets" Condition="Exists('$(SolutionDir)\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.8\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" />
<Import Project="$(SolutionDir)\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.8\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets" Condition="Exists('$(SolutionDir)\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.8\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" /> <Import Project="$(SolutionDir)\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.8\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets" Condition="Exists('$(SolutionDir)\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.8\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" />
</Project> </Project>