diff --git a/osu.Android.props b/osu.Android.props
index 2c5e54d4f5..e64102c401 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -63,6 +63,6 @@
-
+
diff --git a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
index f063898a9f..7eec971b62 100644
--- a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
@@ -27,11 +27,6 @@ private void load(FrameworkDebugConfigManager config, FrameworkConfigManager fra
Bindable = frameworkConfig.GetBindable(FrameworkSetting.PerformanceLogging)
},
new SettingsCheckbox
- {
- LabelText = "Bypass caching (slow)",
- Bindable = config.GetBindable(DebugSetting.BypassCaching)
- },
- new SettingsCheckbox
{
LabelText = "Bypass front-to-back render pass",
Bindable = config.GetBindable(DebugSetting.BypassFrontToBackPass)
diff --git a/osu.Game/Overlays/Settings/Sections/Debug/GCSettings.cs b/osu.Game/Overlays/Settings/Sections/Debug/MemorySettings.cs
similarity index 63%
rename from osu.Game/Overlays/Settings/Sections/Debug/GCSettings.cs
rename to osu.Game/Overlays/Settings/Sections/Debug/MemorySettings.cs
index 6897b42f4f..db64c9a8ac 100644
--- a/osu.Game/Overlays/Settings/Sections/Debug/GCSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Debug/MemorySettings.cs
@@ -1,26 +1,26 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-using System;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
+using osu.Framework.Platform;
namespace osu.Game.Overlays.Settings.Sections.Debug
{
- public class GCSettings : SettingsSubsection
+ public class MemorySettings : SettingsSubsection
{
- protected override string Header => "Garbage Collector";
+ protected override string Header => "Memory";
[BackgroundDependencyLoader]
- private void load(FrameworkDebugConfigManager config)
+ private void load(FrameworkDebugConfigManager config, GameHost host)
{
Children = new Drawable[]
{
new SettingsButton
{
- Text = "Force garbage collection",
- Action = GC.Collect
+ Text = "Clear all caches",
+ Action = host.Collect
},
};
}
diff --git a/osu.Game/Overlays/Settings/Sections/DebugSection.cs b/osu.Game/Overlays/Settings/Sections/DebugSection.cs
index 0149cab802..f62de0b243 100644
--- a/osu.Game/Overlays/Settings/Sections/DebugSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/DebugSection.cs
@@ -17,7 +17,7 @@ public DebugSection()
Children = new Drawable[]
{
new GeneralSettings(),
- new GCSettings(),
+ new MemorySettings(),
};
}
}
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 2551ffe2fc..a9e4eaa9b3 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -141,6 +141,7 @@ public class BufferedWedgeInfo : BufferedContainer
private readonly RulesetInfo ruleset;
public BufferedWedgeInfo(WorkingBeatmap beatmap, RulesetInfo userRuleset)
+ : base(pixelSnapping: true)
{
this.beatmap = beatmap;
ruleset = userRuleset ?? beatmap.BeatmapInfo.Ruleset;
@@ -152,7 +153,6 @@ private void load(LocalisationManager localisation)
var beatmapInfo = beatmap.BeatmapInfo;
var metadata = beatmapInfo.Metadata ?? beatmap.BeatmapSetInfo?.Metadata ?? new BeatmapMetadata();
- PixelSnapping = true;
CacheDrawnFrameBuffer = true;
RelativeSizeAxes = Axes.Both;
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 472f6e9d65..1f91ce1cd8 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/osu.iOS.props b/osu.iOS.props
index 0a19eac2b5..66f398a927 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -105,8 +105,8 @@
-
-
+
+