h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 13:22:57 +08:00
Code Issues Releases Wiki Activity

Show InputSettings on the PlayerLoader screen

Browse Source
This commit is contained in:
Roman Kapustin 2018-05-09 17:31:52 +03:00
parent 6676c55fe0
commit ccf82cacb0
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Screens/Play/PlayerLoader.cs
View File

@ -7,15 +7,15 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Framework.Localisation;
using osu.Framework.Screens; using osu.Framework.Screens;
using osu.Framework.Threading;
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 osu.Framework.Localisation;
using osu.Framework.Threading;
using osu.Game.Screens.Menu; using osu.Game.Screens.Menu;
using osu.Game.Screens.Play.PlayerSettings; using osu.Game.Screens.Play.PlayerSettings;
using OpenTK;
namespace osu.Game.Screens.Play namespace osu.Game.Screens.Play
{ {
@ -51,11 +51,19 @@ namespace osu.Game.Screens.Play
Origin = Anchor.Centre, Origin = Anchor.Centre,
}); });
Add(new VisualSettings Add(new FillFlowContainer<PlayerSettingsGroup>
{ {
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
Margin = new MarginPadding(25) AutoSizeAxes = Axes.Both,
Direction = FillDirection.Vertical,
Spacing = new Vector2(0, 20),
Margin = new MarginPadding { Top = 100, Right = 10 },
Children = new PlayerSettingsGroup[]
{
new VisualSettings(),
new InputSettings()
}
}); });
loadTask = LoadComponentAsync(player); loadTask = LoadComponentAsync(player);

4
osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
View File

@ -20,11 +20,11 @@ namespace osu.Game.Screens.Play.PlayerSettings
{ {
mouseWheelCheckbox = new PlayerCheckbox mouseWheelCheckbox = new PlayerCheckbox
{ {
LabelText = "Disable mouse wheel during gameplay" LabelText = "Disable mouse wheel"
}, },
mouseButtonsCheckbox = new PlayerCheckbox mouseButtonsCheckbox = new PlayerCheckbox
{ {
LabelText = "Disable mouse buttons during gameplay" LabelText = "Disable mouse buttons"
} }
}; };
} }