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

Merge pull request #13958 from ByAgenT/refactor-keybindings-overlay

Browse Source 
Move and merge Overlays.KeyBinding into Overlays.Settings.Sections.Input
This commit is contained in:
Dean Herbert 2021-07-22 15:16:04 +09:00 committed by GitHub
commit 84b67deb4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
View File

@ -8,7 +8,7 @@ using osu.Framework.Testing;
using osu.Framework.Threading;
using osu.Game.Graphics.Sprites;
using osu.Game.Overlays;
using osu.Game.Overlays.KeyBinding;
using osu.Game.Overlays.Settings.Sections.Input;
using osuTK.Input;
namespace osu.Game.Tests.Visual.Settings

3
osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs → osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSection.cs
View File

@ -5,9 +5,8 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Localisation;
using osu.Game.Input.Bindings;
using osu.Game.Overlays.Settings;
namespace osu.Game.Overlays.KeyBinding
namespace osu.Game.Overlays.Settings.Sections.Input
{
public class GlobalKeyBindingsSection : SettingsSection
{

4
osu.Game/Overlays/KeyBindingPanel.cs → osu.Game/Overlays/Settings/Sections/Input/KeyBindingPanel.cs
View File

@ -4,11 +4,9 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Game.Input.Bindings;
using osu.Game.Overlays.KeyBinding;
using osu.Game.Overlays.Settings;
using osu.Game.Rulesets;
namespace osu.Game.Overlays
namespace osu.Game.Overlays.Settings.Sections.Input
{
public class KeyBindingPanel : SettingsSubPanel
{

2
osu.Game/Overlays/KeyBinding/KeyBindingRow.cs → osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
View File

@ -24,7 +24,7 @@ using osuTK;
using osuTK.Graphics;
using osuTK.Input;
namespace osu.Game.Overlays.KeyBinding
namespace osu.Game.Overlays.Settings.Sections.Input
{
public class KeyBindingRow : Container, IFilterable
{

3
osu.Game/Overlays/KeyBinding/KeyBindingsSubsection.cs → osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
View File

@ -9,11 +9,10 @@ using osu.Framework.Graphics;
using osu.Game.Database;
using osu.Game.Graphics.UserInterface;
using osu.Game.Input.Bindings;
using osu.Game.Overlays.Settings;
using osu.Game.Rulesets;
using osuTK;
namespace osu.Game.Overlays.KeyBinding
namespace osu.Game.Overlays.Settings.Sections.Input
{
public abstract class KeyBindingsSubsection : SettingsSubsection
{

3
osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs → osu.Game/Overlays/Settings/Sections/Input/RulesetBindingsSection.cs
View File

@ -4,10 +4,9 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics;
using osu.Game.Overlays.Settings;
using osu.Game.Rulesets;
namespace osu.Game.Overlays.KeyBinding
namespace osu.Game.Overlays.Settings.Sections.Input
{
public class RulesetBindingsSection : SettingsSection
{

2
osu.Game/Overlays/KeyBinding/VariantBindingsSubsection.cs → osu.Game/Overlays/Settings/Sections/Input/VariantBindingsSubsection.cs
View File

@ -4,7 +4,7 @@
using osu.Framework.Localisation;
using osu.Game.Rulesets;
namespace osu.Game.Overlays.KeyBinding
namespace osu.Game.Overlays.Settings.Sections.Input
{
public class VariantBindingsSubsection : KeyBindingsSubsection
{

1
osu.Game/Overlays/SettingsOverlay.cs
View File

@ -6,6 +6,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Overlays.Settings;
using osu.Game.Overlays.Settings.Sections;
using osu.Game.Overlays.Settings.Sections.Input;
using osuTK.Graphics;
using System.Collections.Generic;
using System.Linq;