1
0
mirror of https://github.com/ppy/osu synced 2024-12-15 03:16:17 +00:00

Merge branch 'master' into fix-long-combo-test

This commit is contained in:
Dan Balasescu 2019-09-18 12:41:43 +09:00 committed by GitHub
commit 834111c488
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
osu.Game/Overlays/Settings/Sections

View File

@ -26,11 +26,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
LabelText = "Video",
Bindable = config.GetBindable<bool>(OsuSetting.ShowVideoBackground)
},
new SettingsCheckbox
{
LabelText = "Rotate cursor when dragging",
Bindable = config.GetBindable<bool>(OsuSetting.CursorRotation)
},
new SettingsEnumDropdown<ScreenshotFormat>
{
LabelText = "Screenshot format",

View File

@ -6,7 +6,7 @@ using osu.Game.Configuration;
namespace osu.Game.Overlays.Settings.Sections.Graphics
{
public class MainMenuSettings : SettingsSubsection
public class UserInterfaceSettings : SettingsSubsection
{
protected override string Header => "User Interface";
@ -15,6 +15,11 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
{
Children = new[]
{
new SettingsCheckbox
{
LabelText = "Rotate cursor when dragging",
Bindable = config.GetBindable<bool>(OsuSetting.CursorRotation)
},
new SettingsCheckbox
{
LabelText = "Parallax",

View File

@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Settings.Sections
new RendererSettings(),
new LayoutSettings(),
new DetailSettings(),
new MainMenuSettings(),
new UserInterfaceSettings(),
};
}
}