Skip to content

Commit a668ccb

Browse files
Remove obsolete LandscapeWithOverlay from ManiaMobileLayout
The enum value `LandscapeWithOverlay` was marked as obsolete and scheduled for removal. This change removes the enum value, its corresponding UI filtering in `ManiaSettingsSubsection`, and the migration logic in `ManiaRulesetConfigManager`.
1 parent fa3831d commit a668ccb

3 files changed

Lines changed: 0 additions & 24 deletions

File tree

osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ public class ManiaRulesetConfigManager : RulesetConfigManager<ManiaRulesetSettin
1414
public ManiaRulesetConfigManager(SettingsStore? settings, RulesetInfo ruleset, int? variant = null)
1515
: base(settings, ruleset, variant)
1616
{
17-
Migrate();
1817
}
1918

2019
protected override void InitialiseDefaults()
@@ -28,19 +27,6 @@ protected override void InitialiseDefaults()
2827
SetDefault(ManiaRulesetSetting.TouchOverlay, false);
2928
}
3029

31-
public void Migrate()
32-
{
33-
var mobileLayout = GetBindable<ManiaMobileLayout>(ManiaRulesetSetting.MobileLayout);
34-
35-
#pragma warning disable CS0618 // Type or member is obsolete
36-
if (mobileLayout.Value == ManiaMobileLayout.LandscapeWithOverlay)
37-
#pragma warning restore CS0618 // Type or member is obsolete
38-
{
39-
mobileLayout.Value = ManiaMobileLayout.Landscape;
40-
SetValue(ManiaRulesetSetting.TouchOverlay, true);
41-
}
42-
}
43-
4430
public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
4531
{
4632
new TrackedSetting<double>(ManiaRulesetSetting.ScrollSpeed,

osu.Game.Rulesets.Mania/ManiaMobileLayout.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
22
// See the LICENCE file in the repository root for full licence text.
33

4-
using System;
54
using osu.Framework.Localisation;
65
using osu.Game.Localisation;
7-
using osu.Game.Rulesets.Mania.Configuration;
86

97
namespace osu.Game.Rulesets.Mania
108
{
@@ -18,8 +16,5 @@ public enum ManiaMobileLayout
1816

1917
[LocalisableDescription(typeof(RulesetSettingsStrings), nameof(RulesetSettingsStrings.LandscapeExpandedColumns))]
2018
LandscapeExpandedColumns,
21-
22-
[Obsolete($"Use {nameof(ManiaRulesetSetting.TouchOverlay)} instead.")] // todo: can be removed 20260211
23-
LandscapeWithOverlay,
2419
}
2520
}

osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
22
// See the LICENCE file in the repository root for full licence text.
33

4-
using System;
5-
using System.Linq;
64
using osu.Framework;
75
using osu.Framework.Allocation;
86
using osu.Framework.Graphics;
@@ -65,9 +63,6 @@ private void load()
6563
{
6664
Caption = RulesetSettingsStrings.MobileLayout,
6765
Current = config.GetBindable<ManiaMobileLayout>(ManiaRulesetSetting.MobileLayout),
68-
#pragma warning disable CS0618 // Type or member is obsolete
69-
Items = Enum.GetValues<ManiaMobileLayout>().Where(l => l != ManiaMobileLayout.LandscapeWithOverlay),
70-
#pragma warning restore CS0618 // Type or member is obsolete
7166
}));
7267
}
7368
}

0 commit comments

Comments
 (0)