diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 1f937e1837..8c8a3be771 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
]
},
"codefilesanity": {
- "version": "0.0.36",
+ "version": "0.0.37",
"commands": [
"CodeFileSanity"
]
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 47a6a4c3d3..ec57232126 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -2,7 +2,7 @@ blank_issues_enabled: false
contact_links:
- name: Help
url: https://github.com/ppy/osu/discussions/categories/q-a
- about: osu! not working as you'd expect? Not sure it's a bug? Check the Q&A section!
+ about: osu! not working or performing as you'd expect? Not sure it's a bug? Check the Q&A section!
- name: Suggestions or feature request
url: https://github.com/ppy/osu/discussions/categories/ideas
about: Got something you think should change or be added? Search for or start a new discussion!
diff --git a/osu.Android.props b/osu.Android.props
index f4d08e443c..66f518f3d5 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -11,7 +11,7 @@
manifestmerger.jar
-
+
diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index d92fea27bf..21cea3ba76 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -2,12 +2,10 @@
// See the LICENCE file in the repository root for full licence text.
using System;
-using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Reflection;
using System.Runtime.Versioning;
-using System.Threading.Tasks;
using Microsoft.Win32;
using osu.Desktop.Security;
using osu.Framework.Platform;
@@ -17,7 +15,6 @@ using osu.Framework;
using osu.Framework.Logging;
using osu.Game.Updater;
using osu.Desktop.Windows;
-using osu.Framework.Threading;
using osu.Game.IO;
using osu.Game.IPC;
using osu.Game.Utils;
@@ -138,52 +135,10 @@ namespace osu.Desktop
desktopWindow.CursorState |= CursorState.Hidden;
desktopWindow.Title = Name;
- desktopWindow.DragDrop += f =>
- {
- // on macOS, URL associations are handled via SDL_DROPFILE events.
- if (f.StartsWith(OSU_PROTOCOL, StringComparison.Ordinal))
- {
- HandleLink(f);
- return;
- }
-
- fileDrop(new[] { f });
- };
}
protected override BatteryInfo CreateBatteryInfo() => new SDL2BatteryInfo();
- private readonly List importableFiles = new List();
- private ScheduledDelegate? importSchedule;
-
- private void fileDrop(string[] filePaths)
- {
- lock (importableFiles)
- {
- importableFiles.AddRange(filePaths);
-
- Logger.Log($"Adding {filePaths.Length} files for import");
-
- // File drag drop operations can potentially trigger hundreds or thousands of these calls on some platforms.
- // In order to avoid spawning multiple import tasks for a single drop operation, debounce a touch.
- importSchedule?.Cancel();
- importSchedule = Scheduler.AddDelayed(handlePendingImports, 100);
- }
- }
-
- private void handlePendingImports()
- {
- lock (importableFiles)
- {
- Logger.Log($"Handling batch import of {importableFiles.Count} files");
-
- string[] paths = importableFiles.ToArray();
- importableFiles.Clear();
-
- Task.Factory.StartNew(() => Import(paths), TaskCreationOptions.LongRunning);
- }
- }
-
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
diff --git a/osu.Game.Rulesets.Catch/Edit/CatchBeatSnapGrid.cs b/osu.Game.Rulesets.Catch/Edit/CatchBeatSnapGrid.cs
new file mode 100644
index 0000000000..6862696b3a
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Edit/CatchBeatSnapGrid.cs
@@ -0,0 +1,180 @@
+// 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 System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Caching;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Catch.UI;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Screens.Edit;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.Edit
+{
+ ///
+ /// A grid which displays coloured beat divisor lines in proximity to the selection or placement cursor.
+ ///
+ ///
+ /// This class heavily borrows from osu!mania's implementation (ManiaBeatSnapGrid).
+ /// If further changes are to be made, they should also be applied there.
+ /// If the scale of the changes are large enough, abstracting may be a good path.
+ ///
+ public partial class CatchBeatSnapGrid : Component
+ {
+ private const double visible_range = 750;
+
+ ///
+ /// The range of time values of the current selection.
+ ///
+ public (double start, double end)? SelectionTimeRange
+ {
+ set
+ {
+ if (value == selectionTimeRange)
+ return;
+
+ selectionTimeRange = value;
+ lineCache.Invalidate();
+ }
+ }
+
+ [Resolved]
+ private EditorBeatmap beatmap { get; set; } = null!;
+
+ [Resolved]
+ private OsuColour colours { get; set; } = null!;
+
+ [Resolved]
+ private BindableBeatDivisor beatDivisor { get; set; } = null!;
+
+ private readonly Cached lineCache = new Cached();
+
+ private (double start, double end)? selectionTimeRange;
+
+ private ScrollingHitObjectContainer lineContainer = null!;
+
+ [BackgroundDependencyLoader]
+ private void load(HitObjectComposer composer)
+ {
+ lineContainer = new ScrollingHitObjectContainer();
+
+ ((CatchPlayfield)composer.Playfield).UnderlayElements.Add(lineContainer);
+
+ beatDivisor.BindValueChanged(_ => createLines(), true);
+ }
+
+ protected override void Update()
+ {
+ base.Update();
+
+ if (!lineCache.IsValid)
+ {
+ lineCache.Validate();
+ createLines();
+ }
+ }
+
+ private readonly Stack availableLines = new Stack();
+
+ private void createLines()
+ {
+ foreach (var line in lineContainer.Objects.OfType())
+ availableLines.Push(line);
+
+ lineContainer.Clear();
+
+ if (selectionTimeRange == null)
+ return;
+
+ var range = selectionTimeRange.Value;
+
+ var timingPoint = beatmap.ControlPointInfo.TimingPointAt(range.start - visible_range);
+
+ double time = timingPoint.Time;
+ int beat = 0;
+
+ // progress time until in the visible range.
+ while (time < range.start - visible_range)
+ {
+ time += timingPoint.BeatLength / beatDivisor.Value;
+ beat++;
+ }
+
+ while (time < range.end + visible_range)
+ {
+ var nextTimingPoint = beatmap.ControlPointInfo.TimingPointAt(time);
+
+ // switch to the next timing point if we have reached it.
+ if (nextTimingPoint.Time > timingPoint.Time)
+ {
+ beat = 0;
+ time = nextTimingPoint.Time;
+ timingPoint = nextTimingPoint;
+ }
+
+ Color4 colour = BindableBeatDivisor.GetColourFor(
+ BindableBeatDivisor.GetDivisorForBeatIndex(beat, beatDivisor.Value), colours);
+
+ if (!availableLines.TryPop(out var line))
+ line = new DrawableGridLine();
+
+ line.HitObject.StartTime = time;
+ line.Colour = colour;
+
+ lineContainer.Add(line);
+
+ beat++;
+ time += timingPoint.BeatLength / beatDivisor.Value;
+ }
+
+ // required to update ScrollingHitObjectContainer's cache.
+ lineContainer.UpdateSubTree();
+
+ foreach (var line in lineContainer.Objects.OfType())
+ {
+ time = line.HitObject.StartTime;
+
+ if (time >= range.start && time <= range.end)
+ line.Alpha = 1;
+ else
+ {
+ double timeSeparation = time < range.start ? range.start - time : time - range.end;
+ line.Alpha = (float)Math.Max(0, 1 - timeSeparation / visible_range);
+ }
+ }
+ }
+
+ private partial class DrawableGridLine : DrawableHitObject
+ {
+ public DrawableGridLine()
+ : base(new HitObject())
+ {
+ RelativeSizeAxes = Axes.X;
+ Height = 2;
+
+ AddInternal(new Box { RelativeSizeAxes = Axes.Both });
+ }
+
+ [BackgroundDependencyLoader]
+ private void load()
+ {
+ Origin = Anchor.BottomLeft;
+ Anchor = Anchor.BottomLeft;
+ }
+
+ protected override void UpdateInitialTransforms()
+ {
+ // don't perform any fading – we are handling that ourselves.
+ LifetimeEnd = HitObject.StartTime + visible_range;
+ }
+ }
+ }
+}
diff --git a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
index 8afeca3e51..f2877572e8 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
@@ -33,6 +33,8 @@ namespace osu.Game.Rulesets.Catch.Edit
private InputManager inputManager = null!;
+ private CatchBeatSnapGrid beatSnapGrid = null!;
+
private readonly BindableDouble timeRangeMultiplier = new BindableDouble(1)
{
MinValue = 1,
@@ -65,6 +67,8 @@ namespace osu.Game.Rulesets.Catch.Edit
Catcher.BASE_DASH_SPEED, -Catcher.BASE_DASH_SPEED,
Catcher.BASE_WALK_SPEED, -Catcher.BASE_WALK_SPEED,
}));
+
+ AddInternal(beatSnapGrid = new CatchBeatSnapGrid());
}
protected override void LoadComplete()
@@ -74,6 +78,29 @@ namespace osu.Game.Rulesets.Catch.Edit
inputManager = GetContainingInputManager();
}
+ protected override void UpdateAfterChildren()
+ {
+ base.UpdateAfterChildren();
+
+ if (BlueprintContainer.CurrentTool is SelectTool)
+ {
+ if (EditorBeatmap.SelectedHitObjects.Any())
+ {
+ beatSnapGrid.SelectionTimeRange = (EditorBeatmap.SelectedHitObjects.Min(h => h.StartTime), EditorBeatmap.SelectedHitObjects.Max(h => h.GetEndTime()));
+ }
+ else
+ beatSnapGrid.SelectionTimeRange = null;
+ }
+ else
+ {
+ var result = FindSnappedPositionAndTime(inputManager.CurrentState.Mouse.Position);
+ if (result.Time is double time)
+ beatSnapGrid.SelectionTimeRange = (time, time);
+ else
+ beatSnapGrid.SelectionTimeRange = null;
+ }
+ }
+
protected override double ReadCurrentDistanceSnap(HitObject before, HitObject after)
{
// osu!catch's distance snap implementation is limited, in that a custom spacing cannot be specified.
diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index cf7337fd0d..f091dee845 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -3,6 +3,7 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Catch.Objects;
using osu.Game.Rulesets.Catch.Objects.Drawables;
@@ -41,6 +42,8 @@ namespace osu.Game.Rulesets.Catch.UI
internal CatcherArea CatcherArea { get; private set; } = null!;
+ public Container UnderlayElements { get; private set; } = null!;
+
private readonly IBeatmapDifficultyInfo difficulty;
public CatchPlayfield(IBeatmapDifficultyInfo difficulty)
@@ -62,6 +65,10 @@ namespace osu.Game.Rulesets.Catch.UI
AddRangeInternal(new[]
{
+ UnderlayElements = new Container
+ {
+ RelativeSizeAxes = Axes.Both,
+ },
droppedObjectContainer,
Catcher.CreateProxiedContent(),
HitObjectContainer.CreateProxy(),
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestScenePlayfield.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestScenePlayfield.cs
index f85e303940..6485cbb76b 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestScenePlayfield.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestScenePlayfield.cs
@@ -8,6 +8,7 @@ using NUnit.Framework;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Mania.Beatmaps;
using osu.Game.Rulesets.Mania.UI;
+using osuTK;
namespace osu.Game.Rulesets.Mania.Tests.Skinning
{
@@ -25,22 +26,35 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
new StageDefinition(2)
};
- SetContents(_ => new ManiaPlayfield(stageDefinitions));
+ SetContents(_ => new ManiaInputManager(new ManiaRuleset().RulesetInfo, 2)
+ {
+ Child = new ManiaPlayfield(stageDefinitions)
+ });
});
}
- [Test]
- public void TestDualStages()
+ [TestCase(2)]
+ [TestCase(3)]
+ [TestCase(5)]
+ public void TestDualStages(int columnCount)
{
AddStep("create stage", () =>
{
stageDefinitions = new List
{
- new StageDefinition(2),
- new StageDefinition(2)
+ new StageDefinition(columnCount),
+ new StageDefinition(columnCount)
};
- SetContents(_ => new ManiaPlayfield(stageDefinitions));
+ SetContents(_ => new ManiaInputManager(new ManiaRuleset().RulesetInfo, (int)PlayfieldType.Dual + 2 * columnCount)
+ {
+ Child = new ManiaPlayfield(stageDefinitions)
+ {
+ // bit of a hack to make sure the dual stages fit on screen without overlapping each other.
+ Size = new Vector2(1.5f),
+ Scale = new Vector2(1 / 1.5f)
+ }
+ });
});
}
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index 632b7cdcc7..bdc5a00583 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -119,14 +119,12 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
yield return obj;
}
- private readonly List prevNoteTimes = new List(max_notes_for_density);
+ private readonly LimitedCapacityQueue prevNoteTimes = new LimitedCapacityQueue(max_notes_for_density);
private double density = int.MaxValue;
private void computeDensity(double newNoteTime)
{
- if (prevNoteTimes.Count == max_notes_for_density)
- prevNoteTimes.RemoveAt(0);
- prevNoteTimes.Add(newNoteTime);
+ prevNoteTimes.Enqueue(newNoteTime);
if (prevNoteTimes.Count >= 2)
density = (prevNoteTimes[^1] - prevNoteTimes[0]) / prevNoteTimes.Count;
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index d1d5492b7a..2d4b5f718c 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Rulesets.Mania.Edit
}
Color4 colour = BindableBeatDivisor.GetColourFor(
- BindableBeatDivisor.GetDivisorForBeatIndex(Math.Max(1, beat), beatDivisor.Value), colours);
+ BindableBeatDivisor.GetDivisorForBeatIndex(beat, beatDivisor.Value), colours);
foreach (var grid in grids)
{
diff --git a/osu.Game.Rulesets.Mania/Objects/BarLine.cs b/osu.Game.Rulesets.Mania/Objects/BarLine.cs
index 3f04a4fafe..09a746042b 100644
--- a/osu.Game.Rulesets.Mania/Objects/BarLine.cs
+++ b/osu.Game.Rulesets.Mania/Objects/BarLine.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Objects;
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 3f91328128..a8563d65c4 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -242,18 +242,23 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
bodyPiece.Y = (Direction.Value == ScrollingDirection.Up ? 1 : -1) * Head.Height / 2;
bodyPiece.Height = DrawHeight - Head.Height / 2 + Tail.Height / 2;
- // As the note is being held, adjust the size of the sizing container. This has two effects:
- // 1. The contained masking container will mask the body and ticks.
- // 2. The head note will move along with the new "head position" in the container.
- //
- // As per stable, this should not apply for early hits, waiting until the object starts to touch the
- // judgement area first.
- if (Head.IsHit && releaseTime == null && DrawHeight > 0 && Time.Current >= HitObject.StartTime)
+ if (Time.Current >= HitObject.StartTime)
{
- // How far past the hit target this hold note is.
- float yOffset = Direction.Value == ScrollingDirection.Up ? -Y : Y;
- sizingContainer.Height = 1 - yOffset / DrawHeight;
+ // As the note is being held, adjust the size of the sizing container. This has two effects:
+ // 1. The contained masking container will mask the body and ticks.
+ // 2. The head note will move along with the new "head position" in the container.
+ //
+ // As per stable, this should not apply for early hits, waiting until the object starts to touch the
+ // judgement area first.
+ if (Head.IsHit && releaseTime == null && DrawHeight > 0)
+ {
+ // How far past the hit target this hold note is.
+ float yOffset = Direction.Value == ScrollingDirection.Up ? -Y : Y;
+ sizingContainer.Height = 1 - yOffset / DrawHeight;
+ }
}
+ else
+ sizingContainer.Height = 1;
}
protected override void CheckForResult(bool userTriggered, double timeOffset)
diff --git a/osu.Game.Rulesets.Mania/Objects/HeadNote.cs b/osu.Game.Rulesets.Mania/Objects/HeadNote.cs
index fb5c7b4ddd..e69cc62aed 100644
--- a/osu.Game.Rulesets.Mania/Objects/HeadNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HeadNote.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
namespace osu.Game.Rulesets.Mania.Objects
{
public class HeadNote : Note
diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
index 007d02400a..ddd6365c25 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
@@ -139,11 +139,11 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
case 3:
switch (columnIndex)
{
- case 0: return colour_pink;
+ case 0: return colour_green;
- case 1: return colour_orange;
+ case 1: return colour_special_column;
- case 2: return colour_yellow;
+ case 2: return colour_cyan;
default: throw new ArgumentOutOfRangeException();
}
@@ -185,11 +185,11 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
case 1: return colour_orange;
- case 2: return colour_yellow;
+ case 2: return colour_green;
case 3: return colour_cyan;
- case 4: return colour_purple;
+ case 4: return colour_orange;
case 5: return colour_pink;
@@ -201,17 +201,17 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
{
case 0: return colour_pink;
- case 1: return colour_cyan;
+ case 1: return colour_orange;
case 2: return colour_pink;
case 3: return colour_special_column;
- case 4: return colour_green;
+ case 4: return colour_pink;
- case 5: return colour_cyan;
+ case 5: return colour_orange;
- case 6: return colour_green;
+ case 6: return colour_pink;
default: throw new ArgumentOutOfRangeException();
}
@@ -225,9 +225,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
case 2: return colour_orange;
- case 3: return colour_yellow;
+ case 3: return colour_green;
- case 4: return colour_yellow;
+ case 4: return colour_cyan;
case 5: return colour_orange;
@@ -273,9 +273,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
case 3: return colour_yellow;
- case 4: return colour_cyan;
+ case 4: return colour_green;
- case 5: return colour_green;
+ case 5: return colour_cyan;
case 6: return colour_yellow;
diff --git a/osu.Game.Rulesets.Mania/Skinning/Default/ManiaTrianglesSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Default/ManiaTrianglesSkinTransformer.cs
index eb51179cea..3e0fe8ed4b 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Default/ManiaTrianglesSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Default/ManiaTrianglesSkinTransformer.cs
@@ -35,10 +35,12 @@ namespace osu.Game.Rulesets.Mania.Skinning.Default
var stage = beatmap.GetStageForColumnIndex(column);
- if (stage.IsSpecialColumn(column))
+ int columnInStage = column % stage.Columns;
+
+ if (stage.IsSpecialColumn(columnInStage))
return SkinUtils.As(new Bindable(colourSpecial));
- int distanceToEdge = Math.Min(column, (stage.Columns - 1) - column);
+ int distanceToEdge = Math.Min(columnInStage, (stage.Columns - 1) - columnInStage);
return SkinUtils.As(new Bindable(distanceToEdge % 2 == 0 ? colourOdd : colourEven));
}
}
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 6ca830a82f..f38571a6d3 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Pooling;
using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
using osu.Framework.Platform;
+using osu.Game.Extensions;
using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.Mania.Objects.Drawables;
@@ -39,7 +40,11 @@ namespace osu.Game.Rulesets.Mania.UI
public readonly Bindable Action = new Bindable();
public readonly ColumnHitObjectArea HitObjectArea;
+
+ internal readonly Container BackgroundContainer = new Container { RelativeSizeAxes = Axes.Both };
+
internal readonly Container TopLevelContainer = new Container { RelativeSizeAxes = Axes.Both };
+
private DrawablePool hitExplosionPool;
private readonly OrderedHitPolicy hitPolicy;
public Container UnderlayElements => HitObjectArea.UnderlayElements;
@@ -76,30 +81,31 @@ namespace osu.Game.Rulesets.Mania.UI
skin.SourceChanged += onSourceChanged;
onSourceChanged();
- Drawable background = new SkinnableDrawable(new ManiaSkinComponentLookup(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
- {
- RelativeSizeAxes = Axes.Both,
- };
-
- InternalChildren = new[]
+ InternalChildren = new Drawable[]
{
hitExplosionPool = new DrawablePool(5),
sampleTriggerSource = new GameplaySampleTriggerSource(HitObjectContainer),
- // For input purposes, the background is added at the highest depth, but is then proxied back below all other elements
- background.CreateProxy(),
HitObjectArea,
keyArea = new SkinnableDrawable(new ManiaSkinComponentLookup(ManiaSkinComponents.KeyArea), _ => new DefaultKeyArea())
{
RelativeSizeAxes = Axes.Both,
},
- background,
+ // For input purposes, the background is added at the highest depth, but is then proxied back below all other elements externally
+ // (see `Stage.columnBackgrounds`).
+ BackgroundContainer,
TopLevelContainer,
new ColumnTouchInputArea(this)
};
- applyGameWideClock(background);
- applyGameWideClock(keyArea);
+ var background = new SkinnableDrawable(new ManiaSkinComponentLookup(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
+ {
+ RelativeSizeAxes = Axes.Both,
+ };
+ background.ApplyGameWideClock(host);
+ keyArea.ApplyGameWideClock(host);
+
+ BackgroundContainer.Add(background);
TopLevelContainer.Add(HitObjectArea.Explosions.CreateProxy());
RegisterPool(10, 50);
@@ -107,18 +113,6 @@ namespace osu.Game.Rulesets.Mania.UI
RegisterPool(10, 50);
RegisterPool(10, 50);
RegisterPool(50, 250);
-
- // Some elements don't handle rewind correctly and fixing them is non-trivial.
- // In the future we need a better solution to this, but as a temporary work-around, give these components the game-wide
- // clock so they don't need to worry about rewind.
- // This only works because they handle OnPressed/OnReleased which results in a correct state while rewinding.
- //
- // This is kinda dodgy (and will cause weirdness when pausing gameplay) but is better than completely broken rewind.
- void applyGameWideClock(Drawable drawable)
- {
- drawable.Clock = host.UpdateThread.Clock;
- drawable.ProcessCustomClock = false;
- }
}
private void onSourceChanged()
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index c1d3e85bf1..879c704450 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -60,6 +60,7 @@ namespace osu.Game.Rulesets.Mania.UI
RelativeSizeAxes = Axes.Y;
AutoSizeAxes = Axes.X;
+ Container columnBackgrounds;
Container topLevelContainer;
InternalChildren = new Drawable[]
@@ -77,9 +78,10 @@ namespace osu.Game.Rulesets.Mania.UI
{
RelativeSizeAxes = Axes.Both
},
- columnFlow = new ColumnFlow(definition)
+ columnBackgrounds = new Container
{
- RelativeSizeAxes = Axes.Y,
+ Name = "Column backgrounds",
+ RelativeSizeAxes = Axes.Both,
},
new Container
{
@@ -98,6 +100,10 @@ namespace osu.Game.Rulesets.Mania.UI
RelativeSizeAxes = Axes.Y,
}
},
+ columnFlow = new ColumnFlow(definition)
+ {
+ RelativeSizeAxes = Axes.Y,
+ },
new SkinnableDrawable(new ManiaSkinComponentLookup(ManiaSkinComponents.StageForeground), _ => null)
{
RelativeSizeAxes = Axes.Both
@@ -126,6 +132,7 @@ namespace osu.Game.Rulesets.Mania.UI
};
topLevelContainer.Add(column.TopLevelContainer.CreateProxy());
+ columnBackgrounds.Add(column.BackgroundContainer.CreateProxy());
columnFlow.SetContentForColumn(i, column);
AddNested(column);
}
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
index 3b8a5a90a5..9af1855167 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
AddStep("place first object", () => InputManager.Click(MouseButton.Left));
- AddStep("move mouse slightly", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * 0.02f, 0)));
+ AddStep("move mouse slightly", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * 0.01f, 0)));
AddStep("place second object", () => InputManager.Click(MouseButton.Left));
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
AddStep("enter circle placement mode", () => InputManager.Key(Key.Number2));
- AddStep("move mouse slightly", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * 0.235f, 0)));
+ AddStep("move mouse slightly", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * 0.205f, 0)));
AddStep("place second object", () => InputManager.Click(MouseButton.Left));
@@ -122,7 +122,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
AddStep("begin drag", () => InputManager.PressButton(MouseButton.Left));
- AddStep("move mouse slightly off centre", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * 0.02f, 0)));
+ AddStep("move mouse slightly off centre", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * 0.01f, 0)));
AddAssert("object 3 snapped to 1", () =>
{
@@ -134,7 +134,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
return Precision.AlmostEquals(first.EndPosition, third.Position);
});
- AddStep("move mouse slightly off centre", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * -0.22f, playfield.ScreenSpaceDrawQuad.Width * 0.21f)));
+ AddStep("move mouse slightly off centre", () => InputManager.MoveMouseTo(playfield.ScreenSpaceDrawQuad.Centre + new Vector2(playfield.ScreenSpaceDrawQuad.Width * -0.21f, playfield.ScreenSpaceDrawQuad.Width * 0.205f)));
AddAssert("object 2 snapped to 1", () =>
{
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
index 7579e8077b..0c064ecfa6 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
@@ -185,7 +185,18 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
AddAssert("Ensure cursor is on a grid line", () =>
{
- return grid.ChildrenOfType().Any(p => Precision.AlmostEquals(p.ScreenSpaceDrawQuad.TopRight.X, grid.ToScreenSpace(cursor.LastSnappedPosition).X));
+ return grid.ChildrenOfType().Any(ring =>
+ {
+ // the grid rings are actually slightly _larger_ than the snapping radii.
+ // this is done such that the snapping radius falls right in the middle of each grid ring thickness-wise,
+ // but it does however complicate the following calculations slightly.
+
+ // we want to calculate the coordinates of the rightmost point on the grid line, which is in the exact middle of the ring thickness-wise.
+ // for the X component, we take the entire width of the ring, minus one half of the inner radius (since we want the middle of the line on the right side).
+ // for the Y component, we just take 0.5f.
+ var rightMiddleOfGridLine = ring.ToScreenSpace(ring.DrawSize * new Vector2(1 - ring.InnerRadius / 2, 0.5f));
+ return Precision.AlmostEquals(rightMiddleOfGridLine.X, grid.ToScreenSpace(cursor.LastSnappedPosition).X);
+ });
});
}
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
index 616a9c362d..32028823ae 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
@@ -1,22 +1,29 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
+using System.Collections.Generic;
using System.Linq;
using NUnit.Framework;
using osu.Framework.Extensions.ObjectExtensions;
using osu.Framework.Testing;
using osu.Framework.Utils;
using osu.Game.Beatmaps;
+using osu.Game.Configuration;
using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Osu.Mods;
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Rulesets.Osu.Skinning.Default;
using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Rulesets.Scoring;
+using osuTK;
namespace osu.Game.Rulesets.Osu.Tests.Mods
{
public partial class TestSceneOsuModAutoplay : OsuModTestScene
{
+ protected override bool AllowFail => true;
+
[Test]
public void TestCursorPositionStoredToJudgement()
{
@@ -44,6 +51,36 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
FinalRate = { Value = 1.3 }
});
+ [Test]
+ public void TestPerfectScoreOnShortSliderWithRepeat()
+ {
+ AddStep("set score to standardised", () => LocalConfig.SetValue(OsuSetting.ScoreDisplayMode, ScoringMode.Standardised));
+
+ CreateModTest(new ModTestData
+ {
+ Autoplay = true,
+ Beatmap = new Beatmap
+ {
+ HitObjects = new List
+ {
+ new Slider
+ {
+ StartTime = 500,
+ Position = new Vector2(256, 192),
+ Path = new SliderPath(new[]
+ {
+ new PathControlPoint(),
+ new PathControlPoint(new Vector2(0, 6.25f))
+ }),
+ RepeatCount = 1,
+ SliderVelocity = 10
+ }
+ }
+ },
+ PassCondition = () => Player.ScoreProcessor.TotalScore.Value == 1_000_000
+ });
+ }
+
private void runSpmTest(Mod mod)
{
SpinnerSpmCalculator? spmCalculator = null;
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPosition.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPosition.cs
index 92071d4a57..616bb17e05 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPosition.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPosition.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
{
public enum SliderPosition
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index ad6af6d74e..aac5f6ffb1 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -187,7 +187,7 @@ namespace osu.Game.Rulesets.Osu.Edit
var playfield = PlayfieldAtScreenSpacePosition(screenSpacePosition);
float snapRadius =
- playfield.GamefieldToScreenSpace(new Vector2(OsuHitObject.OBJECT_RADIUS / 5)).X -
+ playfield.GamefieldToScreenSpace(new Vector2(OsuHitObject.OBJECT_RADIUS * 0.10f)).X -
playfield.GamefieldToScreenSpace(Vector2.Zero).X;
foreach (var b in blueprints)
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
index 32ffb545e0..aaa7c70a8d 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
@@ -18,7 +18,7 @@ using static osu.Game.Input.Handlers.ReplayInputHandler;
namespace osu.Game.Rulesets.Osu.Mods
{
- public class OsuModRelax : ModRelax, IUpdatableByPlayfield, IApplicableToDrawableRuleset, IApplicableToPlayer
+ public class OsuModRelax : ModRelax, IUpdatableByPlayfield, IApplicableToDrawableRuleset, IApplicableToPlayer, IHasNoTimedInputs
{
public override LocalisableString Description => @"You don't need to click. Give your clicking/tapping fingers a break from the heat of things.";
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs
new file mode 100644
index 0000000000..9537f8b388
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs
@@ -0,0 +1,55 @@
+// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Screens.Edit;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+ ///
+ /// Mod that colours s based on the musical division they are on
+ ///
+ public class OsuModSynesthesia : ModSynesthesia, IApplicableToBeatmap, IApplicableToDrawableHitObject
+ {
+ private readonly OsuColour colours = new OsuColour();
+
+ private IBeatmap? currentBeatmap { get; set; }
+
+ public void ApplyToBeatmap(IBeatmap beatmap)
+ {
+ //Store a reference to the current beatmap to look up the beat divisor when notes are drawn
+ if (currentBeatmap != beatmap)
+ currentBeatmap = beatmap;
+ }
+
+ public void ApplyToDrawableHitObject(DrawableHitObject d)
+ {
+ if (currentBeatmap == null) return;
+
+ Color4? timingBasedColour = null;
+
+ d.HitObjectApplied += _ =>
+ {
+ // slider tails are a painful edge case, as their start time is offset 36ms back (see `LegacyLastTick`).
+ // to work around this, look up the slider tail's parenting slider's end time instead to ensure proper snap.
+ double snapTime = d is DrawableSliderTail tail
+ ? tail.Slider.GetEndTime()
+ : d.HitObject.StartTime;
+ timingBasedColour = BindableBeatDivisor.GetColourFor(currentBeatmap.ControlPointInfo.GetClosestBeatDivisor(snapTime), colours);
+ };
+
+ // Need to set this every update to ensure it doesn't get overwritten by DrawableHitObject.OnApply() -> UpdateComboColour().
+ d.OnUpdate += _ =>
+ {
+ if (timingBasedColour != null)
+ d.AccentColour.Value = timingBasedColour.Value;
+ };
+ }
+ }
+}
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 664a8146e7..01174d4d61 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -75,18 +75,24 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
[BackgroundDependencyLoader]
private void load()
{
+ tailContainer = new Container { RelativeSizeAxes = Axes.Both };
+
AddRangeInternal(new Drawable[]
{
shakeContainer = new ShakeContainer
{
ShakeDuration = 30,
RelativeSizeAxes = Axes.Both,
- Children = new Drawable[]
+ Children = new[]
{
Body = new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.SliderBody), _ => new DefaultSliderBody(), confineMode: ConfineMode.NoScaling),
- tailContainer = new Container { RelativeSizeAxes = Axes.Both },
+ // proxied here so that the tail is drawn under repeats/ticks - legacy skins rely on this
+ tailContainer.CreateProxy(),
tickContainer = new Container { RelativeSizeAxes = Axes.Both },
repeatContainer = new Container { RelativeSizeAxes = Axes.Both },
+ // actual tail container is placed here to ensure that tail hitobjects are processed after ticks/repeats.
+ // this is required for the correct operation of Score V2.
+ tailContainer,
}
},
// slider head is not included in shake as it handles hit detection, and handles its own shaking.
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/IRequireTracking.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/IRequireTracking.cs
index 55de5a0e8d..b1815b23c9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/IRequireTracking.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/IRequireTracking.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
namespace osu.Game.Rulesets.Osu.Objects.Drawables
{
public interface IRequireTracking
diff --git a/osu.Game.Rulesets.Osu/Objects/ISliderProgress.cs b/osu.Game.Rulesets.Osu/Objects/ISliderProgress.cs
index eddd251bda..7594f7c2e0 100644
--- a/osu.Game.Rulesets.Osu/Objects/ISliderProgress.cs
+++ b/osu.Game.Rulesets.Osu/Objects/ISliderProgress.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
namespace osu.Game.Rulesets.Osu.Objects
{
public interface ISliderProgress
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 8ce55d78dd..4cff16b46f 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -204,7 +204,8 @@ namespace osu.Game.Rulesets.Osu
new MultiMod(new OsuModMagnetised(), new OsuModRepel()),
new ModAdaptiveSpeed(),
new OsuModFreezeFrame(),
- new OsuModBubbles()
+ new OsuModBubbles(),
+ new OsuModSynesthesia()
};
case ModType.System:
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
index 1c5cf49625..3427031dc8 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
@@ -48,21 +48,26 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
private Bindable configHitLighting = null!;
+ private static readonly Vector2 circle_size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+
[Resolved]
private DrawableHitObject drawableObject { get; set; } = null!;
public ArgonMainCirclePiece(bool withOuterFill)
{
- Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+ Size = circle_size;
Anchor = Anchor.Centre;
Origin = Anchor.Centre;
InternalChildren = new Drawable[]
{
- outerFill = new Circle // renders white outer border and dark fill
+ outerFill = new Circle // renders dark fill
{
- Size = Size,
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ // Slightly inset to prevent bleeding outside the ring
+ Size = circle_size - new Vector2(1),
Alpha = withOuterFill ? 1 : 0,
},
outerGradient = new Circle // renders the outer bright gradient
@@ -88,7 +93,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
Masking = true,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
- Size = Size,
+ Size = circle_size,
Child = new KiaiFlash
{
RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game.Rulesets.Taiko/Objects/HitType.cs b/osu.Game.Rulesets.Taiko/Objects/HitType.cs
index eae7fa683a..17b3fdbd04 100644
--- a/osu.Game.Rulesets.Taiko/Objects/HitType.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/HitType.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
namespace osu.Game.Rulesets.Taiko.Objects
{
///
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonCirclePiece.cs
index d7e37899ce..cecb99c690 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonCirclePiece.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
private const double pre_beat_transition_time = 80;
- private const float flash_opacity = 0.3f;
+ private const float kiai_flash_opacity = 0.15f;
private ColourInfo accentColour;
@@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
if (drawableHitObject.State.Value == ArmedState.Idle)
{
flash
- .FadeTo(flash_opacity)
+ .FadeTo(kiai_flash_opacity)
.Then()
.FadeOut(timingPoint.BeatLength * 0.75, Easing.OutSine);
}
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonHitExplosion.cs
index a47fd7e62e..cddae7f05b 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonHitExplosion.cs
@@ -1,9 +1,7 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Effects;
using osu.Framework.Graphics.Shapes;
@@ -18,7 +16,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
public partial class ArgonHitExplosion : CompositeDrawable, IAnimatableHitExplosion
{
private readonly TaikoSkinComponents component;
+
private readonly Circle outer;
+ private readonly Circle inner;
public ArgonHitExplosion(TaikoSkinComponents component)
{
@@ -34,13 +34,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both,
- Colour = ColourInfo.GradientVertical(
- new Color4(255, 227, 236, 255),
- new Color4(255, 198, 211, 255)
- ),
Masking = true,
},
- new Circle
+ inner = new Circle
{
Name = "Inner circle",
Anchor = Anchor.Centre,
@@ -48,12 +44,6 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
RelativeSizeAxes = Axes.Both,
Colour = Color4.White,
Size = new Vector2(0.85f),
- EdgeEffect = new EdgeEffectParameters
- {
- Type = EdgeEffectType.Glow,
- Colour = new Color4(255, 132, 191, 255).Opacity(0.5f),
- Radius = 45,
- },
Masking = true,
},
};
@@ -63,6 +53,16 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
{
this.FadeOut();
+ bool isRim = (drawableHitObject.HitObject as Hit)?.Type == HitType.Rim;
+
+ outer.Colour = isRim ? ArgonInputDrum.RIM_HIT_GRADIENT : ArgonInputDrum.CENTRE_HIT_GRADIENT;
+ inner.EdgeEffect = new EdgeEffectParameters
+ {
+ Type = EdgeEffectType.Glow,
+ Colour = (isRim ? ArgonInputDrum.RIM_HIT_GLOW : ArgonInputDrum.CENTRE_HIT_GLOW).Opacity(0.5f),
+ Radius = 45,
+ };
+
switch (component)
{
case TaikoSkinComponents.TaikoExplosionGreat:
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonInputDrum.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonInputDrum.cs
index e7b0a5537a..f7b7105bdc 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonInputDrum.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonInputDrum.cs
@@ -19,6 +19,20 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
{
public partial class ArgonInputDrum : AspectContainer
{
+ public static readonly ColourInfo RIM_HIT_GRADIENT = ColourInfo.GradientHorizontal(
+ new Color4(227, 248, 255, 255),
+ new Color4(198, 245, 255, 255)
+ );
+
+ public static readonly Colour4 RIM_HIT_GLOW = new Color4(126, 215, 253, 255);
+
+ public static readonly ColourInfo CENTRE_HIT_GRADIENT = ColourInfo.GradientHorizontal(
+ new Color4(255, 227, 236, 255),
+ new Color4(255, 198, 211, 255)
+ );
+
+ public static readonly Colour4 CENTRE_HIT_GLOW = new Color4(255, 147, 199, 255);
+
private const float rim_size = 0.3f;
public ArgonInputDrum()
@@ -141,14 +155,11 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
Anchor = anchor,
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both,
- Colour = ColourInfo.GradientHorizontal(
- new Color4(227, 248, 255, 255),
- new Color4(198, 245, 255, 255)
- ),
+ Colour = RIM_HIT_GRADIENT,
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Glow,
- Colour = new Color4(126, 215, 253, 170),
+ Colour = RIM_HIT_GLOW.Opacity(0.66f),
Radius = 50,
},
Alpha = 0,
@@ -166,14 +177,11 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
Anchor = anchor,
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both,
- Colour = ColourInfo.GradientHorizontal(
- new Color4(255, 227, 236, 255),
- new Color4(255, 198, 211, 255)
- ),
+ Colour = CENTRE_HIT_GRADIENT,
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Glow,
- Colour = new Color4(255, 147, 199, 255),
+ Colour = CENTRE_HIT_GLOW,
Radius = 50,
},
Size = new Vector2(1 - rim_size),
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs
index bde502bbed..b3833d372c 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Default
private const double pre_beat_transition_time = 80;
- private const float flash_opacity = 0.3f;
+ private const float kiai_flash_opacity = 0.15f;
[Resolved]
private DrawableHitObject drawableHitObject { get; set; } = null!;
@@ -187,7 +187,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Default
if (drawableHitObject.State.Value == ArmedState.Idle)
{
flashBox
- .FadeTo(flash_opacity)
+ .FadeTo(kiai_flash_opacity)
.Then()
.FadeOut(timingPoint.BeatLength * 0.75, Easing.OutSine);
}
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 09130ac57d..fac5e098b9 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -231,7 +231,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
protected override IBeatmap GetBeatmap() => beatmap;
- protected override Texture GetBackground() => throw new NotImplementedException();
+ public override Texture GetBackground() => throw new NotImplementedException();
protected override Track GetBeatmapTrack() => throw new NotImplementedException();
diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
index 295a10ba5b..3d1f7c5b17 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
@@ -131,7 +131,7 @@ namespace osu.Game.Tests.Editing.Checks
var mock = new Mock();
mock.SetupGet(w => w.Beatmap).Returns(beatmap);
- mock.SetupGet(w => w.Background).Returns(background);
+ mock.Setup(w => w.GetBackground()).Returns(background);
mock.Setup(w => w.GetStream(It.IsAny())).Returns(stream);
return mock;
diff --git a/osu.Game.Tests/Rulesets/TestSceneBrokenRulesetHandling.cs b/osu.Game.Tests/Rulesets/TestSceneBrokenRulesetHandling.cs
index c3a6b7c474..dac6beea65 100644
--- a/osu.Game.Tests/Rulesets/TestSceneBrokenRulesetHandling.cs
+++ b/osu.Game.Tests/Rulesets/TestSceneBrokenRulesetHandling.cs
@@ -73,7 +73,5 @@ namespace osu.Game.Tests.Rulesets
public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => null;
public override DifficultyCalculator CreateDifficultyCalculator(IWorkingBeatmap beatmap) => null;
}
-
-#nullable enable
}
}
diff --git a/osu.Game.Tests/Visual/Background/TestSceneBackgroundScreenDefault.cs b/osu.Game.Tests/Visual/Background/TestSceneBackgroundScreenDefault.cs
index 8f4250799e..1523ae7027 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneBackgroundScreenDefault.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneBackgroundScreenDefault.cs
@@ -286,7 +286,7 @@ namespace osu.Game.Tests.Visual.Background
this.renderer = renderer;
}
- protected override Texture GetBackground() => renderer.CreateTexture(1, 1);
+ public override Texture GetBackground() => renderer.CreateTexture(1, 1);
}
private partial class TestWorkingBeatmapWithStoryboard : TestWorkingBeatmap
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
index 353acfa4ba..88b959a2a0 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using System;
using System.Diagnostics;
using System.Linq;
@@ -23,8 +21,8 @@ namespace osu.Game.Tests.Visual.Editing
{
public partial class TestSceneBeatDivisorControl : OsuManualInputManagerTestScene
{
- private BeatDivisorControl beatDivisorControl;
- private BindableBeatDivisor bindableBeatDivisor;
+ private BeatDivisorControl beatDivisorControl = null!;
+ private BindableBeatDivisor bindableBeatDivisor = null!;
private SliderBar tickSliderBar => beatDivisorControl.ChildrenOfType>().Single();
private Triangle tickMarkerHead => tickSliderBar.ChildrenOfType().Single();
@@ -51,9 +49,9 @@ namespace osu.Game.Tests.Visual.Editing
[Test]
public void TestBindableBeatDivisor()
{
- AddRepeatStep("move previous", () => bindableBeatDivisor.Previous(), 2);
+ AddRepeatStep("move previous", () => bindableBeatDivisor.SelectPrevious(), 2);
AddAssert("divisor is 4", () => bindableBeatDivisor.Value == 4);
- AddRepeatStep("move next", () => bindableBeatDivisor.Next(), 1);
+ AddRepeatStep("move next", () => bindableBeatDivisor.SelectNext(), 1);
AddAssert("divisor is 12", () => bindableBeatDivisor.Value == 8);
}
@@ -101,16 +99,22 @@ namespace osu.Game.Tests.Visual.Editing
public void TestBeatChevronNavigation()
{
switchBeatSnap(1);
+ assertBeatSnap(16);
+
+ switchBeatSnap(-4);
assertBeatSnap(1);
switchBeatSnap(3);
assertBeatSnap(8);
- switchBeatSnap(-1);
+ switchBeatSnap(3);
+ assertBeatSnap(16);
+
+ switchBeatSnap(-2);
assertBeatSnap(4);
switchBeatSnap(-3);
- assertBeatSnap(16);
+ assertBeatSnap(1);
}
[Test]
@@ -163,9 +167,11 @@ namespace osu.Game.Tests.Visual.Editing
switchPresets(1);
assertPreset(BeatDivisorType.Triplets);
+ assertBeatSnap(6);
switchPresets(1);
assertPreset(BeatDivisorType.Common);
+ assertBeatSnap(4);
switchPresets(-1);
assertPreset(BeatDivisorType.Triplets);
@@ -181,6 +187,7 @@ namespace osu.Game.Tests.Visual.Editing
setDivisorViaInput(15);
assertPreset(BeatDivisorType.Custom, 15);
+ assertBeatSnap(15);
switchBeatSnap(-1);
assertBeatSnap(5);
@@ -190,12 +197,14 @@ namespace osu.Game.Tests.Visual.Editing
setDivisorViaInput(5);
assertPreset(BeatDivisorType.Custom, 15);
+ assertBeatSnap(5);
switchPresets(1);
assertPreset(BeatDivisorType.Common);
switchPresets(-1);
- assertPreset(BeatDivisorType.Triplets);
+ assertPreset(BeatDivisorType.Custom, 15);
+ assertBeatSnap(15);
}
private void switchBeatSnap(int direction) => AddRepeatStep($"move snap {(direction > 0 ? "forward" : "backward")}", () =>
@@ -207,7 +216,7 @@ namespace osu.Game.Tests.Visual.Editing
}, Math.Abs(direction));
private void assertBeatSnap(int expected) => AddAssert($"beat snap is {expected}",
- () => bindableBeatDivisor.Value == expected);
+ () => bindableBeatDivisor.Value, () => Is.EqualTo(expected));
private void switchPresets(int direction) => AddRepeatStep($"move presets {(direction > 0 ? "forward" : "backward")}", () =>
{
@@ -219,7 +228,7 @@ namespace osu.Game.Tests.Visual.Editing
private void assertPreset(BeatDivisorType type, int? maxDivisor = null)
{
- AddAssert($"preset is {type}", () => bindableBeatDivisor.ValidDivisors.Value.Type == type);
+ AddAssert($"preset is {type}", () => bindableBeatDivisor.ValidDivisors.Value.Type, () => Is.EqualTo(type));
if (type == BeatDivisorType.Custom)
{
@@ -237,7 +246,7 @@ namespace osu.Game.Tests.Visual.Editing
InputManager.Click(MouseButton.Left);
});
- BeatDivisorControl.CustomDivisorPopover popover = null;
+ BeatDivisorControl.CustomDivisorPopover? popover = null;
AddUntilStep("wait for popover", () => (popover = this.ChildrenOfType().SingleOrDefault()) != null && popover.IsLoaded);
AddStep($"set divisor to {divisor}", () =>
{
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapOffsetControl.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapOffsetControl.cs
index 6eae795630..f3701b664c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapOffsetControl.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapOffsetControl.cs
@@ -8,6 +8,8 @@ using NUnit.Framework;
using osu.Framework.Graphics;
using osu.Framework.Testing;
using osu.Game.Overlays.Settings;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Mods;
using osu.Game.Scoring;
using osu.Game.Screens.Play.PlayerSettings;
using osu.Game.Tests.Visual.Ranking;
@@ -49,6 +51,21 @@ namespace osu.Game.Tests.Visual.Gameplay
AddAssert("No calibration button", () => !offsetControl.ChildrenOfType().Any());
}
+ [Test]
+ public void TestModRemovingTimedInputs()
+ {
+ AddStep("Set score with mod removing timed inputs", () =>
+ {
+ offsetControl.ReferenceScore.Value = new ScoreInfo
+ {
+ HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents(10),
+ Mods = new Mod[] { new OsuModRelax() }
+ };
+ });
+
+ AddAssert("No calibration button", () => !offsetControl.ChildrenOfType().Any());
+ }
+
[Test]
public void TestCalibrationFromZero()
{
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
index 5855838d3c..e975a85401 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
@@ -7,12 +7,15 @@ using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
using osu.Framework.Testing;
+using osu.Framework.Utils;
using osu.Game.Rulesets.Osu;
using osu.Game.Rulesets.UI;
using osu.Game.Screens.Play;
using osu.Game.Screens.Play.HUD;
using osu.Game.Skinning;
+using osuTK.Graphics;
namespace osu.Game.Tests.Visual.Gameplay
{
@@ -21,6 +24,8 @@ namespace osu.Game.Tests.Visual.Gameplay
{
private GameplayClockContainer gameplayClockContainer = null!;
+ private Box background = null!;
+
private const double skip_target_time = -2000;
[BackgroundDependencyLoader]
@@ -30,11 +35,20 @@ namespace osu.Game.Tests.Visual.Gameplay
FrameStabilityContainer frameStabilityContainer;
- Add(gameplayClockContainer = new MasterGameplayClockContainer(Beatmap.Value, skip_target_time)
+ AddRange(new Drawable[]
{
- Child = frameStabilityContainer = new FrameStabilityContainer
+ background = new Box
{
- MaxCatchUpFrames = 1
+ Colour = Color4.Black,
+ RelativeSizeAxes = Axes.Both,
+ Depth = float.MaxValue
+ },
+ gameplayClockContainer = new MasterGameplayClockContainer(Beatmap.Value, skip_target_time)
+ {
+ Child = frameStabilityContainer = new FrameStabilityContainer
+ {
+ MaxCatchUpFrames = 1
+ }
}
});
@@ -71,9 +85,20 @@ namespace osu.Game.Tests.Visual.Gameplay
applyToArgonProgress(s => s.ShowGraph.Value = b);
});
+ AddStep("set white background", () => background.FadeColour(Color4.White, 200, Easing.OutQuint));
+ AddStep("randomise background colour", () => background.FadeColour(new Colour4(RNG.NextSingle(), RNG.NextSingle(), RNG.NextSingle(), 1), 200, Easing.OutQuint));
+
AddStep("stop", gameplayClockContainer.Stop);
}
+ [Test]
+ public void TestSeekToKnownTime()
+ {
+ AddStep("seek to known time", () => gameplayClockContainer.Seek(60000));
+ AddWaitStep("wait some for seek", 15);
+ AddStep("stop", () => gameplayClockContainer.Stop());
+ }
+
private void applyToArgonProgress(Action action) =>
this.ChildrenOfType().ForEach(action);
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
index 45f671618e..66ba908879 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
@@ -8,6 +8,7 @@ using System.Linq;
using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
+using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Input;
using osu.Framework.Testing;
@@ -57,11 +58,36 @@ namespace osu.Game.Tests.Visual.Multiplayer
AddAssert("customisation area not expanded", () => this.ChildrenOfType().Single().Height == 0);
}
+ [Test]
+ public void TestSelectAllButtonUpdatesStateWhenSearchTermChanged()
+ {
+ createFreeModSelect();
+
+ AddStep("apply search term", () => freeModSelectOverlay.SearchTerm = "ea");
+
+ AddAssert("select all button enabled", () => this.ChildrenOfType().Single().Enabled.Value);
+
+ AddStep("click select all button", navigateAndClick);
+ AddAssert("select all button disabled", () => !this.ChildrenOfType().Single().Enabled.Value);
+
+ AddStep("change search term", () => freeModSelectOverlay.SearchTerm = "e");
+
+ AddAssert("select all button enabled", () => this.ChildrenOfType().Single().Enabled.Value);
+
+ void navigateAndClick() where T : Drawable
+ {
+ InputManager.MoveMouseTo(this.ChildrenOfType().Single());
+ InputManager.Click(MouseButton.Left);
+ }
+ }
+
[Test]
public void TestSelectDeselectAllViaKeyboard()
{
createFreeModSelect();
+ AddStep("kill search bar focus", () => freeModSelectOverlay.SearchTextBox.KillFocus());
+
AddStep("press ctrl+a", () => InputManager.Keys(PlatformAction.SelectAll));
AddUntilStep("all mods selected", assertAllAvailableModsSelected);
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
index 9b130071cc..947b7e5be6 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
@@ -94,6 +94,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
[TestCase(typeof(OsuModHidden), typeof(OsuModTraceable))] // Incompatible.
public void TestAllowedModDeselectedWhenRequired(Type allowedMod, Type requiredMod)
{
+ AddStep("change ruleset", () => Ruleset.Value = new OsuRuleset().RulesetInfo);
AddStep($"select {allowedMod.ReadableName()} as allowed", () => songSelect.FreeMods.Value = new[] { (Mod)Activator.CreateInstance(allowedMod) });
AddStep($"select {requiredMod.ReadableName()} as required", () => songSelect.Mods.Value = new[] { (Mod)Activator.CreateInstance(requiredMod) });
@@ -102,17 +103,17 @@ namespace osu.Game.Tests.Visual.Multiplayer
// A previous test's mod overlay could still be fading out.
AddUntilStep("wait for only one freemod overlay", () => this.ChildrenOfType().Count() == 1);
- assertHasFreeModButton(allowedMod, false);
- assertHasFreeModButton(requiredMod, false);
+ assertFreeModNotShown(allowedMod);
+ assertFreeModNotShown(requiredMod);
}
- private void assertHasFreeModButton(Type type, bool hasButton = true)
+ private void assertFreeModNotShown(Type type)
{
- AddAssert($"{type.ReadableName()} {(hasButton ? "displayed" : "not displayed")} in freemod overlay",
+ AddAssert($"{type.ReadableName()} not displayed in freemod overlay",
() => this.ChildrenOfType()
.Single()
.ChildrenOfType()
- .Where(panel => !panel.Filtered.Value)
+ .Where(panel => panel.Visible)
.All(b => b.Mod.GetType() != type));
}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
index 8816787ceb..a41eff067b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
@@ -203,7 +203,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
AddUntilStep("mod select contains only double time mod",
() => this.ChildrenOfType().Single().UserModsSelectOverlay
.ChildrenOfType()
- .SingleOrDefault(panel => !panel.Filtered.Value)?.Mod is OsuModDoubleTime);
+ .SingleOrDefault(panel => panel.Visible)?.Mod is OsuModDoubleTime);
}
[Test]
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 193cec8907..18aef99ccd 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -17,6 +17,7 @@ using osu.Game.Beatmaps;
using osu.Game.Collections;
using osu.Game.Configuration;
using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API;
using osu.Game.Online.Leaderboards;
using osu.Game.Overlays;
using osu.Game.Overlays.BeatmapListing;
@@ -539,6 +540,11 @@ namespace osu.Game.Tests.Visual.Navigation
AddStep("open room", () => multiplayerComponents.ChildrenOfType().Single().Open());
AddStep("press back button", () => Game.ChildrenOfType().First().Action());
AddWaitStep("wait two frames", 2);
+
+ AddStep("exit lounge", () => Game.ScreenStack.Exit());
+ // `TestMultiplayerComponents` registers a request handler in its BDL, but never unregisters it.
+ // to prevent the handler living for longer than it should be, clean up manually.
+ AddStep("clean up multiplayer request handler", () => ((DummyAPIAccess)API).HandleRequest = null);
}
[Test]
diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
index a27c4ddad2..d9763ef6c8 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
@@ -86,6 +86,7 @@ namespace osu.Game.Tests.Visual.Online
StarRating = 9.99,
DifficultyName = @"TEST",
Length = 456000,
+ HitLength = 400000,
RulesetID = 3,
CircleSize = 1,
DrainRate = 2.3f,
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
index 4f825e1191..885c00be80 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using System;
using System.Linq;
using System.Threading;
@@ -24,8 +22,8 @@ namespace osu.Game.Tests.Visual.Online
{
private readonly APIUser streamingUser = new APIUser { Id = 2, Username = "Test user" };
- private TestSpectatorClient spectatorClient;
- private CurrentlyPlayingDisplay currentlyPlaying;
+ private TestSpectatorClient spectatorClient = null!;
+ private CurrentlyPlayingDisplay currentlyPlaying = null!;
[SetUpSteps]
public void SetUpSteps()
@@ -88,13 +86,13 @@ namespace osu.Game.Tests.Visual.Online
"pishifat"
};
- protected override Task ComputeValueAsync(int lookup, CancellationToken token = default)
+ protected override Task ComputeValueAsync(int lookup, CancellationToken token = default)
{
// tests against failed lookups
if (lookup == 13)
- return Task.FromResult(null);
+ return Task.FromResult(null);
- return Task.FromResult(new APIUser
+ return Task.FromResult(new APIUser
{
Id = lookup,
Username = usernames[lookup % usernames.Length],
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 61a8322ee3..61f95dc628 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -453,6 +453,25 @@ namespace osu.Game.Tests.Visual.SongSelect
AddStep("Un-filter", () => carousel.Filter(new FilterCriteria(), false));
}
+ [Test]
+ public void TestRewindToDeletedBeatmap()
+ {
+ loadBeatmaps();
+
+ var firstAdded = TestResources.CreateTestBeatmapSetInfo();
+
+ AddStep("add new set", () => carousel.UpdateBeatmapSet(firstAdded));
+ AddStep("select set", () => carousel.SelectBeatmap(firstAdded.Beatmaps.First()));
+
+ nextRandom();
+
+ AddStep("delete set", () => carousel.RemoveBeatmapSet(firstAdded));
+
+ prevRandom();
+
+ AddAssert("deleted set not selected", () => carousel.SelectedBeatmapSet?.Equals(firstAdded) == false);
+ }
+
///
/// Test adding and removing beatmap sets
///
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index c2537cff79..379bd838cd 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -1,10 +1,9 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using System;
using System.Collections.Generic;
+using System.Diagnostics;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
@@ -24,10 +23,10 @@ namespace osu.Game.Tests.Visual.SongSelect
{
public partial class TestSceneBeatmapMetadataDisplay : OsuTestScene
{
- private BeatmapMetadataDisplay display;
+ private BeatmapMetadataDisplay display = null!;
[Resolved]
- private BeatmapManager manager { get; set; }
+ private BeatmapManager manager { get; set; } = null!;
[Cached(typeof(BeatmapDifficultyCache))]
private readonly TestBeatmapDifficultyCache testDifficultyCache = new TestBeatmapDifficultyCache();
@@ -121,7 +120,7 @@ namespace osu.Game.Tests.Visual.SongSelect
private partial class TestBeatmapDifficultyCache : BeatmapDifficultyCache
{
- private TaskCompletionSource calculationBlocker;
+ private TaskCompletionSource? calculationBlocker;
private bool blockCalculation;
@@ -142,10 +141,13 @@ namespace osu.Game.Tests.Visual.SongSelect
}
}
- public override async Task GetDifficultyAsync(IBeatmapInfo beatmapInfo, IRulesetInfo rulesetInfo = null, IEnumerable mods = null, CancellationToken cancellationToken = default)
+ public override async Task GetDifficultyAsync(IBeatmapInfo beatmapInfo, IRulesetInfo? rulesetInfo = null, IEnumerable? mods = null, CancellationToken cancellationToken = default)
{
if (blockCalculation)
+ {
+ Debug.Assert(calculationBlocker != null);
await calculationBlocker.Task.ConfigureAwait(false);
+ }
return await base.GetDifficultyAsync(beatmapInfo, rulesetInfo, mods, cancellationToken).ConfigureAwait(false);
}
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
index a11000214c..18739c0275 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModColumn.cs
@@ -106,26 +106,26 @@ namespace osu.Game.Tests.Visual.UserInterface
});
AddStep("set filter", () => setFilter(mod => mod.Name.Contains("Wind", StringComparison.CurrentCultureIgnoreCase)));
- AddUntilStep("two panels visible", () => column.ChildrenOfType().Count(panel => !panel.Filtered.Value) == 2);
+ AddUntilStep("two panels visible", () => column.ChildrenOfType().Count(panel => panel.Visible) == 2);
clickToggle();
AddUntilStep("wait for animation", () => !column.SelectionAnimationRunning);
- AddAssert("only visible items selected", () => column.ChildrenOfType().Where(panel => panel.Active.Value).All(panel => !panel.Filtered.Value));
+ AddAssert("only visible items selected", () => column.ChildrenOfType().Where(panel => panel.Active.Value).All(panel => panel.Visible));
AddStep("unset filter", () => setFilter(null));
- AddUntilStep("all panels visible", () => column.ChildrenOfType().All(panel => !panel.Filtered.Value));
+ AddUntilStep("all panels visible", () => column.ChildrenOfType().All(panel => panel.Visible));
AddAssert("checkbox not selected", () => !column.ChildrenOfType().Single().Current.Value);
AddStep("set filter", () => setFilter(mod => mod.Name.Contains("Wind", StringComparison.CurrentCultureIgnoreCase)));
- AddUntilStep("two panels visible", () => column.ChildrenOfType().Count(panel => !panel.Filtered.Value) == 2);
+ AddUntilStep("two panels visible", () => column.ChildrenOfType().Count(panel => panel.Visible) == 2);
AddAssert("checkbox selected", () => column.ChildrenOfType().Single().Current.Value);
AddStep("filter out everything", () => setFilter(_ => false));
- AddUntilStep("no panels visible", () => column.ChildrenOfType().All(panel => panel.Filtered.Value));
+ AddUntilStep("no panels visible", () => column.ChildrenOfType().All(panel => !panel.Visible));
AddUntilStep("checkbox hidden", () => !column.ChildrenOfType().Single().IsPresent);
AddStep("inset filter", () => setFilter(null));
- AddUntilStep("all panels visible", () => column.ChildrenOfType().All(panel => !panel.Filtered.Value));
+ AddUntilStep("all panels visible", () => column.ChildrenOfType().All(panel => panel.Visible));
AddUntilStep("checkbox visible", () => column.ChildrenOfType().Single().IsPresent);
void clickToggle() => AddStep("click toggle", () =>
@@ -288,10 +288,53 @@ namespace osu.Game.Tests.Visual.UserInterface
AddAssert("no change", () => this.ChildrenOfType().Count(panel => panel.Active.Value) == 2);
}
+ [Test]
+ public void TestApplySearchTerms()
+ {
+ Mod hidden = getExampleModsFor(ModType.DifficultyIncrease).Where(modState => modState.Mod is ModHidden).Select(modState => modState.Mod).Single();
+
+ ModColumn column = null!;
+ AddStep("create content", () => Child = new Container
+ {
+ RelativeSizeAxes = Axes.Both,
+ Padding = new MarginPadding(30),
+ Child = column = new ModColumn(ModType.DifficultyIncrease, false)
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ AvailableMods = getExampleModsFor(ModType.DifficultyIncrease)
+ }
+ });
+
+ applySearchAndAssert(hidden.Name);
+
+ clearSearch();
+
+ applySearchAndAssert(hidden.Acronym);
+
+ clearSearch();
+
+ applySearchAndAssert(hidden.Description.ToString());
+
+ void applySearchAndAssert(string searchTerm)
+ {
+ AddStep("search by mod name", () => column.SearchTerm = searchTerm);
+
+ AddAssert("only hidden is visible", () => column.ChildrenOfType().Where(panel => panel.Visible).All(panel => panel.Mod is ModHidden));
+ }
+
+ void clearSearch()
+ {
+ AddStep("clear search", () => column.SearchTerm = string.Empty);
+
+ AddAssert("all mods are visible", () => column.ChildrenOfType().All(panel => panel.Visible));
+ }
+ }
+
private void setFilter(Func? filter)
{
foreach (var modState in this.ChildrenOfType().Single().AvailableMods)
- modState.Filtered.Value = filter?.Invoke(modState.Mod) == false;
+ modState.ValidForSelection.Value = filter?.Invoke(modState.Mod) != false;
}
private partial class TestModColumn : ModColumn
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
index 3efdba8754..2d54a4e566 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
@@ -392,6 +392,28 @@ namespace osu.Game.Tests.Visual.UserInterface
new HashSet(this.ChildrenOfType().First().Preset.Value.Mods).SetEquals(mods));
}
+ [Test]
+ public void TestTextFiltering()
+ {
+ ModPresetColumn modPresetColumn = null!;
+
+ AddStep("clear mods", () => SelectedMods.Value = Array.Empty());
+ AddStep("create content", () => Child = modPresetColumn = new ModPresetColumn
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ });
+
+ AddUntilStep("items loaded", () => modPresetColumn.IsLoaded && modPresetColumn.ItemsLoaded);
+
+ AddStep("set osu! ruleset", () => Ruleset.Value = rulesets.GetRuleset(0));
+ AddStep("set text filter", () => modPresetColumn.SearchTerm = "First");
+ AddUntilStep("one panel visible", () => modPresetColumn.ChildrenOfType().Count(panel => panel.IsPresent), () => Is.EqualTo(1));
+
+ AddStep("set mania ruleset", () => Ruleset.Value = rulesets.GetRuleset(3));
+ AddUntilStep("no panels visible", () => modPresetColumn.ChildrenOfType().Count(panel => panel.IsPresent), () => Is.EqualTo(0));
+ }
+
private ICollection createTestPresets() => new[]
{
new ModPreset
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 5cf24c1960..d566a04261 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -490,15 +490,15 @@ namespace osu.Game.Tests.Visual.UserInterface
createScreen();
changeRuleset(0);
- AddAssert("double time visible", () => modSelectOverlay.ChildrenOfType().Where(panel => panel.Mod is OsuModDoubleTime).Any(panel => !panel.Filtered.Value));
+ AddAssert("double time visible", () => modSelectOverlay.ChildrenOfType().Where(panel => panel.Mod is OsuModDoubleTime).Any(panel => panel.Visible));
AddStep("make double time invalid", () => modSelectOverlay.IsValidMod = m => !(m is OsuModDoubleTime));
- AddUntilStep("double time not visible", () => modSelectOverlay.ChildrenOfType().Where(panel => panel.Mod is OsuModDoubleTime).All(panel => panel.Filtered.Value));
- AddAssert("nightcore still visible", () => modSelectOverlay.ChildrenOfType().Where(panel => panel.Mod is OsuModNightcore).Any(panel => !panel.Filtered.Value));
+ AddUntilStep("double time not visible", () => modSelectOverlay.ChildrenOfType().Where(panel => panel.Mod is OsuModDoubleTime).All(panel => !panel.Visible));
+ AddAssert("nightcore still visible", () => modSelectOverlay.ChildrenOfType().Where(panel => panel.Mod is OsuModNightcore).Any(panel => panel.Visible));
AddStep("make double time valid again", () => modSelectOverlay.IsValidMod = _ => true);
- AddUntilStep("double time visible", () => modSelectOverlay.ChildrenOfType().Where(panel => panel.Mod is OsuModDoubleTime).Any(panel => !panel.Filtered.Value));
- AddAssert("nightcore still visible", () => modSelectOverlay.ChildrenOfType().Where(b => b.Mod is OsuModNightcore).Any(panel => !panel.Filtered.Value));
+ AddUntilStep("double time visible", () => modSelectOverlay.ChildrenOfType().Where(panel => panel.Mod is OsuModDoubleTime).Any(panel => panel.Visible));
+ AddAssert("nightcore still visible", () => modSelectOverlay.ChildrenOfType().Where(b => b.Mod is OsuModNightcore).Any(panel => panel.Visible));
}
[Test]
@@ -524,7 +524,57 @@ namespace osu.Game.Tests.Visual.UserInterface
AddStep("set ruleset", () => Ruleset.Value = testRuleset.RulesetInfo);
waitForColumnLoad();
- AddAssert("unimplemented mod panel is filtered", () => getPanelForMod(typeof(TestUnimplementedMod)).Filtered.Value);
+ AddAssert("unimplemented mod panel is filtered", () => !getPanelForMod(typeof(TestUnimplementedMod)).Visible);
+ }
+
+ [Test]
+ public void TestFirstModSelectDeselect()
+ {
+ createScreen();
+
+ AddStep("apply search", () => modSelectOverlay.SearchTerm = "HD");
+
+ AddStep("press enter", () => InputManager.Key(Key.Enter));
+ AddAssert("hidden selected", () => getPanelForMod(typeof(OsuModHidden)).Active.Value);
+
+ AddStep("press enter again", () => InputManager.Key(Key.Enter));
+ AddAssert("hidden deselected", () => !getPanelForMod(typeof(OsuModHidden)).Active.Value);
+
+ AddStep("clear search", () => modSelectOverlay.SearchTerm = string.Empty);
+ AddStep("press enter", () => InputManager.Key(Key.Enter));
+ AddAssert("mod select hidden", () => modSelectOverlay.State.Value == Visibility.Hidden);
+ }
+
+ [Test]
+ public void TestSearchFocusChangeViaClick()
+ {
+ createScreen();
+
+ AddStep("click on search", navigateAndClick);
+ AddAssert("focused", () => modSelectOverlay.SearchTextBox.HasFocus);
+
+ AddStep("click on mod column", navigateAndClick);
+ AddAssert("lost focus", () => !modSelectOverlay.SearchTextBox.HasFocus);
+
+ void navigateAndClick() where T : Drawable
+ {
+ InputManager.MoveMouseTo(modSelectOverlay.ChildrenOfType().FirstOrDefault());
+ InputManager.Click(MouseButton.Left);
+ }
+ }
+
+ [Test]
+ public void TestSearchFocusChangeViaKey()
+ {
+ createScreen();
+
+ const Key focus_switch_key = Key.Tab;
+
+ AddStep("press tab", () => InputManager.Key(focus_switch_key));
+ AddAssert("focused", () => modSelectOverlay.SearchTextBox.HasFocus);
+
+ AddStep("press tab", () => InputManager.Key(focus_switch_key));
+ AddAssert("lost focus", () => !modSelectOverlay.SearchTextBox.HasFocus);
}
[Test]
@@ -533,6 +583,8 @@ namespace osu.Game.Tests.Visual.UserInterface
createScreen();
changeRuleset(0);
+ AddStep("kill search bar focus", () => modSelectOverlay.SearchTextBox.KillFocus());
+
AddStep("select DT + HD", () => SelectedMods.Value = new Mod[] { new OsuModDoubleTime(), new OsuModHidden() });
AddAssert("DT + HD selected", () => modSelectOverlay.ChildrenOfType().Count(panel => panel.Active.Value) == 2);
@@ -540,6 +592,26 @@ namespace osu.Game.Tests.Visual.UserInterface
AddUntilStep("all mods deselected", () => !SelectedMods.Value.Any());
}
+ [Test]
+ public void TestDeselectAllViaKey_WithSearchApplied()
+ {
+ createScreen();
+ changeRuleset(0);
+
+ AddStep("select DT + HD", () => SelectedMods.Value = new Mod[] { new OsuModDoubleTime(), new OsuModHidden() });
+ AddStep("focus on search", () => modSelectOverlay.SearchTextBox.TakeFocus());
+ AddStep("apply search", () => modSelectOverlay.SearchTerm = "Easy");
+ AddAssert("DT + HD selected and hidden", () => modSelectOverlay.ChildrenOfType().Count(panel => !panel.Visible && panel.Active.Value) == 2);
+
+ AddStep("press backspace", () => InputManager.Key(Key.BackSpace));
+ AddAssert("DT + HD still selected", () => modSelectOverlay.ChildrenOfType().Count(panel => panel.Active.Value) == 2);
+ AddAssert("search term changed", () => modSelectOverlay.SearchTerm == "Eas");
+
+ AddStep("kill focus", () => modSelectOverlay.SearchTextBox.KillFocus());
+ AddStep("press backspace", () => InputManager.Key(Key.BackSpace));
+ AddUntilStep("all mods deselected", () => !SelectedMods.Value.Any());
+ }
+
[Test]
public void TestDeselectAllViaButton()
{
@@ -561,6 +633,31 @@ namespace osu.Game.Tests.Visual.UserInterface
AddAssert("deselect all button disabled", () => !this.ChildrenOfType().Single().Enabled.Value);
}
+ [Test]
+ public void TestDeselectAllViaButton_WithSearchApplied()
+ {
+ createScreen();
+ changeRuleset(0);
+
+ AddAssert("deselect all button disabled", () => !this.ChildrenOfType().Single().Enabled.Value);
+
+ AddStep("select DT + HD + RD", () => SelectedMods.Value = new Mod[] { new OsuModDoubleTime(), new OsuModHidden(), new OsuModRandom() });
+ AddAssert("DT + HD + RD selected", () => modSelectOverlay.ChildrenOfType().Count(panel => panel.Active.Value) == 3);
+ AddAssert("deselect all button enabled", () => this.ChildrenOfType().Single().Enabled.Value);
+
+ AddStep("apply search", () => modSelectOverlay.SearchTerm = "Easy");
+ AddAssert("DT + HD + RD are hidden and selected", () => modSelectOverlay.ChildrenOfType().Count(panel => !panel.Visible && panel.Active.Value) == 3);
+ AddAssert("deselect all button enabled", () => this.ChildrenOfType().Single().Enabled.Value);
+
+ AddStep("click deselect all button", () =>
+ {
+ InputManager.MoveMouseTo(this.ChildrenOfType().Single());
+ InputManager.Click(MouseButton.Left);
+ });
+ AddUntilStep("all mods deselected", () => !SelectedMods.Value.Any());
+ AddAssert("deselect all button disabled", () => !this.ChildrenOfType().Single().Enabled.Value);
+ }
+
[Test]
public void TestCloseViaBackButton()
{
@@ -580,8 +677,11 @@ namespace osu.Game.Tests.Visual.UserInterface
AddAssert("mod select hidden", () => modSelectOverlay.State.Value == Visibility.Hidden);
}
+ ///
+ /// Covers columns hiding/unhiding on changes of .
+ ///
[Test]
- public void TestColumnHiding()
+ public void TestColumnHidingOnIsValidChange()
{
AddStep("create screen", () => Child = modSelectOverlay = new TestModSelectOverlay
{
@@ -610,6 +710,56 @@ namespace osu.Game.Tests.Visual.UserInterface
AddUntilStep("3 columns visible", () => this.ChildrenOfType().Count(col => col.IsPresent) == 3);
}
+ ///
+ /// Covers columns hiding/unhiding on changes of .
+ ///
+ [Test]
+ public void TestColumnHidingOnTextFilterChange()
+ {
+ AddStep("create screen", () => Child = modSelectOverlay = new TestModSelectOverlay
+ {
+ RelativeSizeAxes = Axes.Both,
+ State = { Value = Visibility.Visible },
+ SelectedMods = { BindTarget = SelectedMods }
+ });
+ waitForColumnLoad();
+ changeRuleset(0);
+
+ AddAssert("all columns visible", () => this.ChildrenOfType().All(col => col.IsPresent));
+
+ AddStep("set search", () => modSelectOverlay.SearchTerm = "HD");
+ AddAssert("one column visible", () => this.ChildrenOfType().Count(col => col.IsPresent) == 1);
+
+ AddStep("filter out everything", () => modSelectOverlay.SearchTerm = "Some long search term with no matches");
+ AddAssert("no columns visible", () => this.ChildrenOfType().All(col => !col.IsPresent));
+
+ AddStep("clear search bar", () => modSelectOverlay.SearchTerm = "");
+ AddAssert("all columns visible", () => this.ChildrenOfType().All(col => col.IsPresent));
+ }
+
+ [Test]
+ public void TestHidingOverlayClearsTextSearch()
+ {
+ AddStep("create screen", () => Child = modSelectOverlay = new TestModSelectOverlay
+ {
+ RelativeSizeAxes = Axes.Both,
+ State = { Value = Visibility.Visible },
+ SelectedMods = { BindTarget = SelectedMods }
+ });
+ waitForColumnLoad();
+ changeRuleset(0);
+
+ AddAssert("all columns visible", () => this.ChildrenOfType().All(col => col.IsPresent));
+
+ AddStep("set search", () => modSelectOverlay.SearchTerm = "fail");
+ AddAssert("one column visible", () => this.ChildrenOfType().Count(col => col.IsPresent) == 2);
+
+ AddStep("hide", () => modSelectOverlay.Hide());
+ AddStep("show", () => modSelectOverlay.Show());
+
+ AddAssert("all columns visible", () => this.ChildrenOfType().All(col => col.IsPresent));
+ }
+
[Test]
public void TestColumnHidingOnRulesetChange()
{
@@ -688,12 +838,10 @@ namespace osu.Game.Tests.Visual.UserInterface
{
public override string ShortName => "unimplemented";
- public override IEnumerable GetModsFor(ModType type)
- {
- if (type == ModType.Conversion) return base.GetModsFor(type).Concat(new[] { new TestUnimplementedMod() });
-
- return base.GetModsFor(type);
- }
+ public override IEnumerable GetModsFor(ModType type) =>
+ type == ModType.Conversion
+ ? base.GetModsFor(type).Concat(new[] { new TestUnimplementedMod() })
+ : base.GetModsFor(type);
}
}
}
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayContainer.cs
index d9c2774611..bb94912c83 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayContainer.cs
@@ -101,6 +101,10 @@ namespace osu.Game.Tests.Visual.UserInterface
},
};
}
+
+ protected override void PopIn()
+ {
+ }
}
}
}
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSectionsContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSectionsContainer.cs
index 05fffc903d..3a1eb554ab 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneSectionsContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSectionsContainer.cs
@@ -80,6 +80,24 @@ namespace osu.Game.Tests.Visual.UserInterface
});
}
+ [Test]
+ public void TestCorrectScrollToWhenContentLoads()
+ {
+ AddRepeatStep("add many sections", () => append(1f), 3);
+
+ AddStep("add section with delayed load content", () =>
+ {
+ container.Add(new TestDelayedLoadSection("delayed"));
+ });
+
+ AddStep("add final section", () => append(0.5f));
+
+ AddStep("scroll to final section", () => container.ScrollTo(container.Children.Last()));
+
+ AddUntilStep("correct section selected", () => container.SelectedSection.Value == container.Children.Last());
+ AddUntilStep("wait for scroll to section", () => container.ScreenSpaceDrawQuad.AABBFloat.Contains(container.Children.Last().ScreenSpaceDrawQuad.AABBFloat));
+ }
+
[Test]
public void TestSelection()
{
@@ -196,6 +214,33 @@ namespace osu.Game.Tests.Visual.UserInterface
InputManager.ScrollVerticalBy(direction);
}
+ private partial class TestDelayedLoadSection : TestSection
+ {
+ public TestDelayedLoadSection(string label)
+ : base(label)
+ {
+ BackgroundColour = default_colour;
+ Width = 300;
+ AutoSizeAxes = Axes.Y;
+ }
+
+ protected override void LoadComplete()
+ {
+ base.LoadComplete();
+
+ Box box;
+
+ Add(box = new Box
+ {
+ Alpha = 0.01f,
+ RelativeSizeAxes = Axes.X,
+ });
+
+ // Emulate an operation that will be inhibited by IsMaskedAway.
+ box.ResizeHeightTo(2000, 50);
+ }
+ }
+
private partial class TestSection : TestBox
{
public bool Selected
diff --git a/osu.Game.Tests/WaveformTestBeatmap.cs b/osu.Game.Tests/WaveformTestBeatmap.cs
index 5e41392560..12660ed2e1 100644
--- a/osu.Game.Tests/WaveformTestBeatmap.cs
+++ b/osu.Game.Tests/WaveformTestBeatmap.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Tests
protected override IBeatmap GetBeatmap() => beatmap;
- protected override Texture GetBackground() => null;
+ public override Texture GetBackground() => null;
protected override Waveform GetWaveform() => new Waveform(trackStore.GetStream(firstAudioFile));
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
index 5695cb5574..94086f10f2 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
@@ -24,6 +24,9 @@ namespace osu.Game.Tournament.Tests.Screens
Add(screen = new MapPoolScreen { Width = 0.7f });
}
+ [SetUp]
+ public void SetUp() => Schedule(() => Ladder.SplitMapPoolByMods.Value = true);
+
[Test]
public void TestFewMaps()
{
@@ -92,7 +95,7 @@ namespace osu.Game.Tournament.Tests.Screens
Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
for (int i = 0; i < 11; i++)
- addBeatmap(i > 4 ? $"M{i}" : "NM");
+ addBeatmap(i > 4 ? Ruleset.Value.CreateInstance().AllMods.ElementAt(i).Acronym : "NM");
});
AddStep("reset match", () =>
@@ -118,7 +121,7 @@ namespace osu.Game.Tournament.Tests.Screens
Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
for (int i = 0; i < 12; i++)
- addBeatmap(i > 4 ? $"M{i}" : "NM");
+ addBeatmap(i > 4 ? Ruleset.Value.CreateInstance().AllMods.ElementAt(i).Acronym : "NM");
});
AddStep("reset match", () =>
@@ -130,7 +133,27 @@ namespace osu.Game.Tournament.Tests.Screens
assertThreeWide();
}
- private void addBeatmap(string mods = "nm")
+ [Test]
+ public void TestSplitMapPoolByMods()
+ {
+ AddStep("load many maps", () =>
+ {
+ Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
+
+ for (int i = 0; i < 12; i++)
+ addBeatmap(i > 4 ? Ruleset.Value.CreateInstance().AllMods.ElementAt(i).Acronym : "NM");
+ });
+
+ AddStep("disable splitting map pool by mods", () => Ladder.SplitMapPoolByMods.Value = false);
+
+ AddStep("reset match", () =>
+ {
+ Ladder.CurrentMatch.Value = new TournamentMatch();
+ Ladder.CurrentMatch.Value = Ladder.Matches.First();
+ });
+ }
+
+ private void addBeatmap(string mods = "NM")
{
Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Add(new RoundBeatmap
{
diff --git a/osu.Game.Tournament/IPC/TourneyState.cs b/osu.Game.Tournament/IPC/TourneyState.cs
index 2c7253dc10..ef1c612a53 100644
--- a/osu.Game.Tournament/IPC/TourneyState.cs
+++ b/osu.Game.Tournament/IPC/TourneyState.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
namespace osu.Game.Tournament.IPC
{
public enum TourneyState
diff --git a/osu.Game.Tournament/Models/LadderInfo.cs b/osu.Game.Tournament/Models/LadderInfo.cs
index 6b64a1156e..cb4e8bc16a 100644
--- a/osu.Game.Tournament/Models/LadderInfo.cs
+++ b/osu.Game.Tournament/Models/LadderInfo.cs
@@ -42,5 +42,7 @@ namespace osu.Game.Tournament.Models
};
public Bindable AutoProgressScreens = new BindableBool(true);
+
+ public Bindable SplitMapPoolByMods = new BindableBool(true);
}
}
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/ConditionalTournamentMatch.cs b/osu.Game.Tournament/Screens/Ladder/Components/ConditionalTournamentMatch.cs
index 04155fcb89..16224a7fb4 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/ConditionalTournamentMatch.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/ConditionalTournamentMatch.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using osu.Game.Tournament.Models;
namespace osu.Game.Tournament.Screens.Ladder.Components
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index f0e34d78c3..cb6c5902ec 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Tournament.Screens.MapPool
{
public partial class MapPoolScreen : TournamentMatchScreen
{
- private readonly FillFlowContainer> mapFlows;
+ private FillFlowContainer> mapFlows;
[Resolved(canBeNull: true)]
private TournamentSceneManager sceneManager { get; set; }
@@ -32,12 +32,13 @@ namespace osu.Game.Tournament.Screens.MapPool
private TeamColour pickColour;
private ChoiceType pickType;
- private readonly OsuButton buttonRedBan;
- private readonly OsuButton buttonBlueBan;
- private readonly OsuButton buttonRedPick;
- private readonly OsuButton buttonBluePick;
+ private OsuButton buttonRedBan;
+ private OsuButton buttonBlueBan;
+ private OsuButton buttonRedPick;
+ private OsuButton buttonBluePick;
- public MapPoolScreen()
+ [BackgroundDependencyLoader]
+ private void load(MatchIPCInfo ipc)
{
InternalChildren = new Drawable[]
{
@@ -98,15 +99,26 @@ namespace osu.Game.Tournament.Screens.MapPool
Action = reset
},
new ControlPanel.Spacer(),
+ new OsuCheckbox
+ {
+ LabelText = "Split display by mods",
+ Current = LadderInfo.SplitMapPoolByMods,
+ },
},
}
};
+
+ ipc.Beatmap.BindValueChanged(beatmapChanged);
}
- [BackgroundDependencyLoader]
- private void load(MatchIPCInfo ipc)
+ private Bindable splitMapPoolByMods;
+
+ protected override void LoadComplete()
{
- ipc.Beatmap.BindValueChanged(beatmapChanged);
+ base.LoadComplete();
+
+ splitMapPoolByMods = LadderInfo.SplitMapPoolByMods.GetBoundCopy();
+ splitMapPoolByMods.BindValueChanged(_ => updateDisplay());
}
private void beatmapChanged(ValueChangedEvent beatmap)
@@ -213,24 +225,27 @@ namespace osu.Game.Tournament.Screens.MapPool
protected override void CurrentMatchChanged(ValueChangedEvent match)
{
base.CurrentMatchChanged(match);
+ updateDisplay();
+ }
+ private void updateDisplay()
+ {
mapFlows.Clear();
- if (match.NewValue == null)
+ if (CurrentMatch.Value == null)
return;
int totalRows = 0;
- if (match.NewValue.Round.Value != null)
+ if (CurrentMatch.Value.Round.Value != null)
{
FillFlowContainer currentFlow = null;
- string currentMod = null;
-
+ string currentMods = null;
int flowCount = 0;
- foreach (var b in match.NewValue.Round.Value.Beatmaps)
+ foreach (var b in CurrentMatch.Value.Round.Value.Beatmaps)
{
- if (currentFlow == null || currentMod != b.Mods)
+ if (currentFlow == null || (LadderInfo.SplitMapPoolByMods.Value && currentMods != b.Mods))
{
mapFlows.Add(currentFlow = new FillFlowContainer
{
@@ -240,7 +255,7 @@ namespace osu.Game.Tournament.Screens.MapPool
AutoSizeAxes = Axes.Y
});
- currentMod = b.Mods;
+ currentMods = b.Mods;
totalRows++;
flowCount = 0;
diff --git a/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs b/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs
new file mode 100644
index 0000000000..acd60b664d
--- /dev/null
+++ b/osu.Game/Beatmaps/BeatmapPanelBackgroundTextureLoaderStore.cs
@@ -0,0 +1,95 @@
+// 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 System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Processing;
+
+namespace osu.Game.Beatmaps
+{
+ // Implementation of this class is based off of `MaxDimensionLimitedTextureLoaderStore`.
+ // If issues are found it's worth checking to make sure similar issues exist there.
+ public class BeatmapPanelBackgroundTextureLoaderStore : IResourceStore
+ {
+ // The aspect ratio of SetPanelBackground at its maximum size (very tall window).
+ private const float minimum_display_ratio = 512 / 80f;
+
+ private readonly IResourceStore? textureStore;
+
+ public BeatmapPanelBackgroundTextureLoaderStore(IResourceStore? textureStore)
+ {
+ this.textureStore = textureStore;
+ }
+
+ public void Dispose()
+ {
+ textureStore?.Dispose();
+ }
+
+ public TextureUpload Get(string name)
+ {
+ var textureUpload = textureStore?.Get(name);
+
+ // NRT not enabled on framework side classes (IResourceStore / TextureLoaderStore), welp.
+ if (textureUpload == null)
+ return null!;
+
+ return limitTextureUploadSize(textureUpload);
+ }
+
+ public async Task GetAsync(string name, CancellationToken cancellationToken = new CancellationToken())
+ {
+ // NRT not enabled on framework side classes (IResourceStore / TextureLoaderStore), welp.
+ if (textureStore == null)
+ return null!;
+
+ var textureUpload = await textureStore.GetAsync(name, cancellationToken).ConfigureAwait(false);
+
+ if (textureUpload == null)
+ return null!;
+
+ return await Task.Run(() => limitTextureUploadSize(textureUpload), cancellationToken).ConfigureAwait(false);
+ }
+
+ private TextureUpload limitTextureUploadSize(TextureUpload textureUpload)
+ {
+ var image = Image.LoadPixelData(textureUpload.Data.ToArray(), textureUpload.Width, textureUpload.Height);
+
+ // The original texture upload will no longer be returned or used.
+ textureUpload.Dispose();
+
+ Size size = image.Size();
+
+ // Assume that panel backgrounds are always displayed using `FillMode.Fill`.
+ // Also assume that all backgrounds are wider than they are tall, so the
+ // fill is always going to be based on width.
+ //
+ // We need to include enough height to make this work for all ratio panels are displayed at.
+ int usableHeight = (int)Math.Ceiling(size.Width * 1 / minimum_display_ratio);
+
+ usableHeight = Math.Min(size.Height, usableHeight);
+
+ // Crop the centre region of the background for now.
+ Rectangle cropRectangle = new Rectangle(
+ 0,
+ (size.Height - usableHeight) / 2,
+ size.Width,
+ usableHeight
+ );
+
+ image.Mutate(i => i.Crop(cropRectangle));
+
+ return new TextureUpload(image);
+ }
+
+ public Stream? GetStream(string name) => textureStore?.GetStream(name);
+
+ public IEnumerable GetAvailableResources() => textureStore?.GetAvailableResources() ?? Array.Empty();
+ }
+}
diff --git a/osu.Game/Beatmaps/DifficultyRating.cs b/osu.Game/Beatmaps/DifficultyRating.cs
index 478c0e36df..f0ee0ad705 100644
--- a/osu.Game/Beatmaps/DifficultyRating.cs
+++ b/osu.Game/Beatmaps/DifficultyRating.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
namespace osu.Game.Beatmaps
{
public enum DifficultyRating
diff --git a/osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs b/osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs
index 767504fcb1..5b9cf6846c 100644
--- a/osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs
+++ b/osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs
@@ -23,8 +23,9 @@ namespace osu.Game.Beatmaps.Drawables
[BackgroundDependencyLoader]
private void load()
{
- if (working.Background != null)
- Texture = working.Background;
+ var background = working.GetBackground();
+ if (background != null)
+ Texture = background;
}
}
}
diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardExtra.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardExtra.cs
index 5c6f0c4ee1..175c15ea7b 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardExtra.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardExtra.cs
@@ -106,12 +106,11 @@ namespace osu.Game.Beatmaps.Drawables.Cards
{
new Drawable[]
{
- new OsuSpriteText
+ new TruncatingSpriteText
{
Text = new RomanisableString(BeatmapSet.TitleUnicode, BeatmapSet.Title),
Font = OsuFont.Default.With(size: 22.5f, weight: FontWeight.SemiBold),
RelativeSizeAxes = Axes.X,
- Truncate = true
},
titleBadgeArea = new FillFlowContainer
{
@@ -140,21 +139,19 @@ namespace osu.Game.Beatmaps.Drawables.Cards
{
new[]
{
- new OsuSpriteText
+ new TruncatingSpriteText
{
Text = createArtistText(),
Font = OsuFont.Default.With(size: 17.5f, weight: FontWeight.SemiBold),
RelativeSizeAxes = Axes.X,
- Truncate = true
},
Empty()
},
}
},
- new OsuSpriteText
+ new TruncatingSpriteText
{
RelativeSizeAxes = Axes.X,
- Truncate = true,
Text = BeatmapSet.Source,
Shadow = false,
Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold),
diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNormal.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNormal.cs
index 720d892495..18e1584a98 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNormal.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNormal.cs
@@ -107,12 +107,11 @@ namespace osu.Game.Beatmaps.Drawables.Cards
{
new Drawable[]
{
- new OsuSpriteText
+ new TruncatingSpriteText
{
Text = new RomanisableString(BeatmapSet.TitleUnicode, BeatmapSet.Title),
Font = OsuFont.Default.With(size: 22.5f, weight: FontWeight.SemiBold),
RelativeSizeAxes = Axes.X,
- Truncate = true
},
titleBadgeArea = new FillFlowContainer
{
@@ -141,12 +140,11 @@ namespace osu.Game.Beatmaps.Drawables.Cards
{
new[]
{
- new OsuSpriteText
+ new TruncatingSpriteText
{
Text = createArtistText(),
Font = OsuFont.Default.With(size: 17.5f, weight: FontWeight.SemiBold),
RelativeSizeAxes = Axes.X,
- Truncate = true
},
Empty()
},
diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardSize.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardSize.cs
index 1f6538a890..098265506d 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardSize.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardSize.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
namespace osu.Game.Beatmaps.Drawables.Cards
{
///
diff --git a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
index 0b390a2ab5..8089d789c1 100644
--- a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Beatmaps
protected override IBeatmap GetBeatmap() => new Beatmap();
- protected override Texture GetBackground() => textures?.Get(@"Backgrounds/bg4");
+ public override Texture GetBackground() => textures?.Get(@"Backgrounds/bg4");
protected override Track GetBeatmapTrack() => GetVirtualTrack();
diff --git a/osu.Game/Beatmaps/FlatFileWorkingBeatmap.cs b/osu.Game/Beatmaps/FlatFileWorkingBeatmap.cs
index 02fcde5257..0b53278ab3 100644
--- a/osu.Game/Beatmaps/FlatFileWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/FlatFileWorkingBeatmap.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Beatmaps
}
protected override IBeatmap GetBeatmap() => beatmap;
- protected override Texture GetBackground() => throw new NotImplementedException();
+ public override Texture GetBackground() => throw new NotImplementedException();
protected override Track GetBeatmapTrack() => throw new NotImplementedException();
protected internal override ISkin GetSkin() => throw new NotImplementedException();
public override Stream GetStream(string storagePath) => throw new NotImplementedException();
diff --git a/osu.Game/Beatmaps/IBeatmapInfo.cs b/osu.Game/Beatmaps/IBeatmapInfo.cs
index 4f2c08f63d..b8c69cc525 100644
--- a/osu.Game/Beatmaps/IBeatmapInfo.cs
+++ b/osu.Game/Beatmaps/IBeatmapInfo.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Beatmaps
IBeatmapSetInfo? BeatmapSet { get; }
///
- /// The playable length in milliseconds of this beatmap.
+ /// The total length in milliseconds of this beatmap.
///
double Length { get; }
diff --git a/osu.Game/Beatmaps/IBeatmapOnlineInfo.cs b/osu.Game/Beatmaps/IBeatmapOnlineInfo.cs
index e1634e7d24..707a0696ba 100644
--- a/osu.Game/Beatmaps/IBeatmapOnlineInfo.cs
+++ b/osu.Game/Beatmaps/IBeatmapOnlineInfo.cs
@@ -59,5 +59,10 @@ namespace osu.Game.Beatmaps
int PassCount { get; }
APIFailTimes? FailTimes { get; }
+
+ ///
+ /// The playable length in milliseconds of this beatmap.
+ ///
+ double HitLength { get; }
}
}
diff --git a/osu.Game/Beatmaps/IBeatmapResourceProvider.cs b/osu.Game/Beatmaps/IBeatmapResourceProvider.cs
index 22ff7ce8c8..9e79e03785 100644
--- a/osu.Game/Beatmaps/IBeatmapResourceProvider.cs
+++ b/osu.Game/Beatmaps/IBeatmapResourceProvider.cs
@@ -9,13 +9,18 @@ using osu.Game.IO;
namespace osu.Game.Beatmaps
{
- public interface IBeatmapResourceProvider : IStorageResourceProvider
+ internal interface IBeatmapResourceProvider : IStorageResourceProvider
{
///
/// Retrieve a global large texture store, used for loading beatmap backgrounds.
///
TextureStore LargeTextureStore { get; }
+ ///
+ /// Retrieve a global large texture store, used specifically for retrieving cropped beatmap panel backgrounds.
+ ///
+ TextureStore BeatmapPanelTextureStore { get; }
+
///
/// Access a global track store for retrieving beatmap tracks from.
///
diff --git a/osu.Game/Beatmaps/IWorkingBeatmap.cs b/osu.Game/Beatmaps/IWorkingBeatmap.cs
index 0f0e72b0ac..bdfa6bdf6d 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -32,12 +32,12 @@ namespace osu.Game.Beatmaps
///
/// Whether the Beatmap has finished loading.
///
- public bool BeatmapLoaded { get; }
+ bool BeatmapLoaded { get; }
///
/// Whether the Track has finished loading.
///
- public bool TrackLoaded { get; }
+ bool TrackLoaded { get; }
///
/// Retrieves the which this represents.
@@ -47,7 +47,12 @@ namespace osu.Game.Beatmaps
///
/// Retrieves the background for this .
///
- Texture Background { get; }
+ Texture GetBackground();
+
+ ///
+ /// Retrieves a cropped background for this used for display on panels.
+ ///
+ Texture GetPanelBackground();
///
/// Retrieves the for the of this .
@@ -124,12 +129,12 @@ namespace osu.Game.Beatmaps
///
/// Beings loading the contents of this asynchronously.
///
- public void BeginAsyncLoad();
+ void BeginAsyncLoad();
///
/// Cancels the asynchronous loading of the contents of this .
///
- public void CancelAsyncLoad();
+ void CancelAsyncLoad();
///
/// Reads the correct track restart point from beatmap metadata and sets looping to enabled.
diff --git a/osu.Game/Beatmaps/Legacy/LegacyOrigins.cs b/osu.Game/Beatmaps/Legacy/LegacyOrigins.cs
index 62b0edc384..31f67d6dfd 100644
--- a/osu.Game/Beatmaps/Legacy/LegacyOrigins.cs
+++ b/osu.Game/Beatmaps/Legacy/LegacyOrigins.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
namespace osu.Game.Beatmaps.Legacy
{
internal enum LegacyOrigins
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 59a71fd80c..25159996f3 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -34,8 +34,6 @@ namespace osu.Game.Beatmaps
public Storyboard Storyboard => storyboard.Value;
- public Texture Background => GetBackground(); // Texture uses ref counting, so we want to return a new instance every usage.
-
public ISkin Skin => skin.Value;
private AudioManager audioManager { get; }
@@ -67,7 +65,8 @@ namespace osu.Game.Beatmaps
protected virtual Storyboard GetStoryboard() => new Storyboard { BeatmapInfo = BeatmapInfo };
protected abstract IBeatmap GetBeatmap();
- protected abstract Texture GetBackground();
+ public abstract Texture GetBackground();
+ public virtual Texture GetPanelBackground() => GetBackground();
protected abstract Track GetBeatmapTrack();
///
diff --git a/osu.Game/Beatmaps/WorkingBeatmapCache.cs b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
index ef843909d8..78eed626f2 100644
--- a/osu.Game/Beatmaps/WorkingBeatmapCache.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
@@ -42,6 +42,7 @@ namespace osu.Game.Beatmaps
private readonly AudioManager audioManager;
private readonly IResourceStore resources;
private readonly LargeTextureStore largeTextureStore;
+ private readonly LargeTextureStore beatmapPanelTextureStore;
private readonly ITrackStore trackStore;
private readonly IResourceStore files;
@@ -58,6 +59,7 @@ namespace osu.Game.Beatmaps
this.host = host;
this.files = files;
largeTextureStore = new LargeTextureStore(host?.Renderer ?? new DummyRenderer(), host?.CreateTextureLoaderStore(files));
+ beatmapPanelTextureStore = new LargeTextureStore(host?.Renderer ?? new DummyRenderer(), new BeatmapPanelBackgroundTextureLoaderStore(host?.CreateTextureLoaderStore(files)));
this.trackStore = trackStore;
}
@@ -110,6 +112,7 @@ namespace osu.Game.Beatmaps
#region IResourceStorageProvider
TextureStore IBeatmapResourceProvider.LargeTextureStore => largeTextureStore;
+ TextureStore IBeatmapResourceProvider.BeatmapPanelTextureStore => beatmapPanelTextureStore;
ITrackStore IBeatmapResourceProvider.Tracks => trackStore;
IRenderer IStorageResourceProvider.Renderer => host?.Renderer ?? new DummyRenderer();
AudioManager IStorageResourceProvider.AudioManager => audioManager;
@@ -160,7 +163,11 @@ namespace osu.Game.Beatmaps
}
}
- protected override Texture GetBackground()
+ public override Texture GetPanelBackground() => getBackgroundFromStore(resources.BeatmapPanelTextureStore);
+
+ public override Texture GetBackground() => getBackgroundFromStore(resources.LargeTextureStore);
+
+ private Texture getBackgroundFromStore(TextureStore store)
{
if (string.IsNullOrEmpty(Metadata?.BackgroundFile))
return null;
@@ -168,7 +175,7 @@ namespace osu.Game.Beatmaps
try
{
string fileStorePath = BeatmapSetInfo.GetPathForFile(Metadata.BackgroundFile);
- var texture = resources.LargeTextureStore.Get(fileStorePath);
+ var texture = store.Get(fileStorePath);
if (texture == null)
{
@@ -257,7 +264,7 @@ namespace osu.Game.Beatmaps
if (beatmapFileStream == null)
{
Logger.Log($"Beatmap failed to load (file {BeatmapInfo.Path} not found on disk at expected location {fileStorePath})", level: LogLevel.Error);
- return null;
+ return new Storyboard();
}
using (var reader = new LineBufferedReader(beatmapFileStream))
diff --git a/osu.Game/Collections/ManageCollectionsDialog.cs b/osu.Game/Collections/ManageCollectionsDialog.cs
index 36142cf26f..31016b807b 100644
--- a/osu.Game/Collections/ManageCollectionsDialog.cs
+++ b/osu.Game/Collections/ManageCollectionsDialog.cs
@@ -114,8 +114,6 @@ namespace osu.Game.Collections
protected override void PopIn()
{
- base.PopIn();
-
lowPassFilter.CutoffTo(300, 100, Easing.OutCubic);
this.FadeIn(enter_duration, Easing.OutQuint);
this.ScaleTo(0.9f).Then().ScaleTo(1f, enter_duration, Easing.OutQuint);
diff --git a/osu.Game/Configuration/IntroSequence.cs b/osu.Game/Configuration/IntroSequence.cs
index 8327ea2f57..5672c44bbe 100644
--- a/osu.Game/Configuration/IntroSequence.cs
+++ b/osu.Game/Configuration/IntroSequence.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
namespace osu.Game.Configuration
{
public enum IntroSequence
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 365ad37f4c..193068193a 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -178,6 +178,7 @@ namespace osu.Game.Configuration
SetDefault(OsuSetting.EditorWaveformOpacity, 0.25f, 0f, 1f, 0.25f);
SetDefault(OsuSetting.EditorShowHitMarkers, true);
SetDefault(OsuSetting.EditorAutoSeekOnPlacement, true);
+ SetDefault(OsuSetting.EditorLimitedDistanceSnap, false);
SetDefault(OsuSetting.LastProcessedMetadataId, -1);
@@ -383,5 +384,6 @@ namespace osu.Game.Configuration
SafeAreaConsiderations,
ComboColourNormalisationAmount,
ProfileCoverExpanded,
+ EditorLimitedDistanceSnap
}
}
diff --git a/osu.Game/Configuration/ReleaseStream.cs b/osu.Game/Configuration/ReleaseStream.cs
index 9cdd91bfd0..ed0bee1dd8 100644
--- a/osu.Game/Configuration/ReleaseStream.cs
+++ b/osu.Game/Configuration/ReleaseStream.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
namespace osu.Game.Configuration
{
public enum ReleaseStream
diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 276563e163..5e2f0c2128 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -6,6 +6,7 @@
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Overlays;
+using osu.Game.Overlays.Mods;
namespace osu.Game.Configuration
{
@@ -21,6 +22,7 @@ namespace osu.Game.Configuration
SetDefault(Static.LowBatteryNotificationShownOnce, false);
SetDefault(Static.FeaturedArtistDisclaimerShownOnce, false);
SetDefault(Static.LastHoverSoundPlaybackTime, (double?)null);
+ SetDefault(Static.LastModSelectPanelSamplePlaybackTime, (double?)null);
SetDefault(Static.SeasonalBackgrounds, null);
}
@@ -56,5 +58,11 @@ namespace osu.Game.Configuration
/// Used to debounce hover sounds game-wide to avoid volume saturation, especially in scrolling views with many UI controls like .
///
LastHoverSoundPlaybackTime,
+
+ ///
+ /// The last playback time in milliseconds of an on/off sample (from ).
+ /// Used to debounce on/off sounds game-wide to avoid volume saturation, especially in activating mod presets with many mods.
+ ///
+ LastModSelectPanelSamplePlaybackTime
}
}
diff --git a/osu.Game/Configuration/ToolbarClockDisplayMode.cs b/osu.Game/Configuration/ToolbarClockDisplayMode.cs
index 682e221ef8..2f42f7a9b5 100644
--- a/osu.Game/Configuration/ToolbarClockDisplayMode.cs
+++ b/osu.Game/Configuration/ToolbarClockDisplayMode.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
namespace osu.Game.Configuration
{
public enum ToolbarClockDisplayMode
diff --git a/osu.Game/Database/BeatmapLookupCache.cs b/osu.Game/Database/BeatmapLookupCache.cs
index d9bf0138dc..973c25ec4f 100644
--- a/osu.Game/Database/BeatmapLookupCache.cs
+++ b/osu.Game/Database/BeatmapLookupCache.cs
@@ -1,13 +1,10 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
-using JetBrains.Annotations;
using osu.Game.Online.API.Requests;
using osu.Game.Online.API.Requests.Responses;
@@ -21,8 +18,7 @@ namespace osu.Game.Database
/// The beatmap to lookup.
/// An optional cancellation token.
/// The populated beatmap, or null if the beatmap does not exist or the request could not be satisfied.
- [ItemCanBeNull]
- public Task GetBeatmapAsync(int beatmapId, CancellationToken token = default) => LookupAsync(beatmapId, token);
+ public Task GetBeatmapAsync(int beatmapId, CancellationToken token = default) => LookupAsync(beatmapId, token);
///
/// Perform an API lookup on the specified beatmaps, populating a model.
@@ -30,10 +26,10 @@ namespace osu.Game.Database
/// The beatmaps to lookup.
/// An optional cancellation token.
/// The populated beatmaps. May include null results for failed retrievals.
- public Task GetBeatmapsAsync(int[] beatmapIds, CancellationToken token = default) => LookupAsync(beatmapIds, token);
+ public Task GetBeatmapsAsync(int[] beatmapIds, CancellationToken token = default) => LookupAsync(beatmapIds, token);
protected override GetBeatmapsRequest CreateRequest(IEnumerable ids) => new GetBeatmapsRequest(ids.ToArray());
- protected override IEnumerable RetrieveResults(GetBeatmapsRequest request) => request.Response?.Beatmaps;
+ protected override IEnumerable? RetrieveResults(GetBeatmapsRequest request) => request.Response?.Beatmaps;
}
}
diff --git a/osu.Game/Database/ISoftDelete.cs b/osu.Game/Database/ISoftDelete.cs
index b07c8db2de..afa42c2002 100644
--- a/osu.Game/Database/ISoftDelete.cs
+++ b/osu.Game/Database/ISoftDelete.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
namespace osu.Game.Database
{
///
diff --git a/osu.Game/Database/MemoryCachingComponent.cs b/osu.Game/Database/MemoryCachingComponent.cs
index 5d1a381f09..e98475efae 100644
--- a/osu.Game/Database/MemoryCachingComponent.cs
+++ b/osu.Game/Database/MemoryCachingComponent.cs
@@ -1,13 +1,11 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using System;
using System.Collections.Concurrent;
+using System.Diagnostics.CodeAnalysis;
using System.Threading;
using System.Threading.Tasks;
-using JetBrains.Annotations;
using osu.Framework.Extensions.TypeExtensions;
using osu.Framework.Graphics;
using osu.Framework.Statistics;
@@ -19,8 +17,9 @@ namespace osu.Game.Database
/// Currently not persisted between game sessions.
///
public abstract partial class MemoryCachingComponent : Component
+ where TLookup : notnull
{
- private readonly ConcurrentDictionary cache = new ConcurrentDictionary();
+ private readonly ConcurrentDictionary cache = new ConcurrentDictionary();
private readonly GlobalStatistic statistics;
@@ -37,12 +36,12 @@ namespace osu.Game.Database
///
/// The lookup to retrieve.
/// An optional to cancel the operation.
- protected async Task GetAsync([NotNull] TLookup lookup, CancellationToken token = default)
+ protected async Task GetAsync(TLookup lookup, CancellationToken token = default)
{
- if (CheckExists(lookup, out TValue performance))
+ if (CheckExists(lookup, out TValue? existing))
{
statistics.Value.HitCount++;
- return performance;
+ return existing;
}
var computed = await ComputeValueAsync(lookup, token).ConfigureAwait(false);
@@ -73,7 +72,7 @@ namespace osu.Game.Database
statistics.Value.Usage = cache.Count;
}
- protected bool CheckExists([NotNull] TLookup lookup, out TValue value) =>
+ protected bool CheckExists(TLookup lookup, [MaybeNullWhen(false)] out TValue value) =>
cache.TryGetValue(lookup, out value);
///
@@ -82,7 +81,7 @@ namespace osu.Game.Database
/// The lookup to retrieve.
/// An optional to cancel the operation.
/// The computed value.
- protected abstract Task ComputeValueAsync(TLookup lookup, CancellationToken token = default);
+ protected abstract Task ComputeValueAsync(TLookup lookup, CancellationToken token = default);
private class MemoryCachingStatistics
{
diff --git a/osu.Game/Database/OnlineLookupCache.cs b/osu.Game/Database/OnlineLookupCache.cs
index d9b37e2f29..3b54804fec 100644
--- a/osu.Game/Database/OnlineLookupCache.cs
+++ b/osu.Game/Database/OnlineLookupCache.cs
@@ -1,14 +1,11 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
-using JetBrains.Annotations;
using osu.Framework.Allocation;
using osu.Framework.Extensions;
using osu.Game.Online.API;
@@ -21,7 +18,7 @@ namespace osu.Game.Database
where TRequest : APIRequest
{
[Resolved]
- private IAPIProvider api { get; set; }
+ private IAPIProvider api { get; set; } = null!;
///
/// Creates an to retrieve the values for a given collection of s.
@@ -32,8 +29,7 @@ namespace osu.Game.Database
///
/// Retrieves a list of s from a successful created by .
///
- [CanBeNull]
- protected abstract IEnumerable RetrieveResults(TRequest request);
+ protected abstract IEnumerable? RetrieveResults(TRequest request);
///
/// Perform a lookup using the specified , populating a .
@@ -41,8 +37,7 @@ namespace osu.Game.Database
/// The ID to lookup.
/// An optional cancellation token.
/// The populated , or null if the value does not exist or the request could not be satisfied.
- [ItemCanBeNull]
- protected Task LookupAsync(TLookup id, CancellationToken token = default) => GetAsync(id, token);
+ protected Task LookupAsync(TLookup id, CancellationToken token = default) => GetAsync(id, token);
///
/// Perform an API lookup on the specified , populating a .
@@ -50,9 +45,9 @@ namespace osu.Game.Database
/// The IDs to lookup.
/// An optional cancellation token.
/// The populated values. May include null results for failed retrievals.
- protected Task LookupAsync(TLookup[] ids, CancellationToken token = default)
+ protected Task LookupAsync(TLookup[] ids, CancellationToken token = default)
{
- var lookupTasks = new List>();
+ var lookupTasks = new List>();
foreach (var id in ids)
{
@@ -69,18 +64,18 @@ namespace osu.Game.Database
}
// cannot be sealed due to test usages (see TestUserLookupCache).
- protected override async Task ComputeValueAsync(TLookup lookup, CancellationToken token = default)
+ protected override async Task ComputeValueAsync(TLookup lookup, CancellationToken token = default)
=> await queryValue(lookup).ConfigureAwait(false);
- private readonly Queue<(TLookup id, TaskCompletionSource)> pendingTasks = new Queue<(TLookup, TaskCompletionSource)>();
- private Task pendingRequestTask;
+ private readonly Queue<(TLookup id, TaskCompletionSource)> pendingTasks = new Queue<(TLookup, TaskCompletionSource)>();
+ private Task? pendingRequestTask;
private readonly object taskAssignmentLock = new object();
- private Task queryValue(TLookup id)
+ private Task queryValue(TLookup id)
{
lock (taskAssignmentLock)
{
- var tcs = new TaskCompletionSource();
+ var tcs = new TaskCompletionSource();
// Add to the queue.
pendingTasks.Enqueue((id, tcs));
@@ -96,14 +91,14 @@ namespace osu.Game.Database
private async Task performLookup()
{
// contains at most 50 unique IDs from tasks, which is used to perform the lookup.
- var nextTaskBatch = new Dictionary>>();
+ var nextTaskBatch = new Dictionary>>();
// Grab at most 50 unique IDs from the queue.
lock (taskAssignmentLock)
{
while (pendingTasks.Count > 0 && nextTaskBatch.Count < 50)
{
- (TLookup id, TaskCompletionSource task) next = pendingTasks.Dequeue();
+ (TLookup id, TaskCompletionSource task) next = pendingTasks.Dequeue();
// Perform a secondary check for existence, in case the value was queried in a previous batch.
if (CheckExists(next.id, out var existing))
@@ -113,7 +108,7 @@ namespace osu.Game.Database
if (nextTaskBatch.TryGetValue(next.id, out var tasks))
tasks.Add(next.task);
else
- nextTaskBatch[next.id] = new List> { next.task };
+ nextTaskBatch[next.id] = new List> { next.task };
}
}
}
diff --git a/osu.Game/Database/UserLookupCache.cs b/osu.Game/Database/UserLookupCache.cs
index b1609fbf7b..e581d5ce82 100644
--- a/osu.Game/Database/UserLookupCache.cs
+++ b/osu.Game/Database/UserLookupCache.cs
@@ -1,13 +1,10 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
-using JetBrains.Annotations;
using osu.Game.Online.API.Requests;
using osu.Game.Online.API.Requests.Responses;
@@ -21,8 +18,7 @@ namespace osu.Game.Database
/// The user to lookup.
/// An optional cancellation token.
/// The populated user, or null if the user does not exist or the request could not be satisfied.
- [ItemCanBeNull]
- public Task GetUserAsync(int userId, CancellationToken token = default) => LookupAsync(userId, token);
+ public Task GetUserAsync(int userId, CancellationToken token = default) => LookupAsync(userId, token);
///
/// Perform an API lookup on the specified users, populating a model.
@@ -30,10 +26,10 @@ namespace osu.Game.Database
/// The users to lookup.
/// An optional cancellation token.
/// The populated users. May include null results for failed retrievals.
- public Task GetUsersAsync(int[] userIds, CancellationToken token = default) => LookupAsync(userIds, token);
+ public Task GetUsersAsync(int[] userIds, CancellationToken token = default) => LookupAsync(userIds, token);
protected override GetUsersRequest CreateRequest(IEnumerable ids) => new GetUsersRequest(ids.ToArray());
- protected override IEnumerable RetrieveResults(GetUsersRequest request) => request.Response?.Users;
+ protected override IEnumerable? RetrieveResults(GetUsersRequest request) => request.Response?.Users;
}
}
diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index 915a2292a2..6553ad3886 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Graphics;
+using osu.Framework.Platform;
using osuTK;
namespace osu.Game.Extensions
@@ -43,5 +44,20 @@ namespace osu.Game.Extensions
/// The delta vector in Parent's coordinates.
public static Vector2 ScreenSpaceDeltaToParentSpace(this Drawable drawable, Vector2 delta) =>
drawable.Parent.ToLocalSpace(drawable.Parent.ToScreenSpace(Vector2.Zero) + delta);
+
+ ///
+ /// Some elements don't handle rewind correctly and fixing them is non-trivial.
+ /// In the future we need a better solution to this, but as a temporary work-around, give these components the game-wide
+ /// clock so they don't need to worry about rewind.
+ ///
+ /// This only works if input handling components handle OnPressed/OnReleased which results in a correct state while rewinding.
+ ///
+ /// This is kinda dodgy (and will cause weirdness when pausing gameplay) but is better than completely broken rewind.
+ ///
+ public static void ApplyGameWideClock(this Drawable drawable, GameHost host)
+ {
+ drawable.Clock = host.UpdateThread.Clock;
+ drawable.ProcessCustomClock = false;
+ }
}
}
diff --git a/osu.Game/Extensions/LanguageExtensions.cs b/osu.Game/Extensions/LanguageExtensions.cs
index 04231c384c..44932cf3c8 100644
--- a/osu.Game/Extensions/LanguageExtensions.cs
+++ b/osu.Game/Extensions/LanguageExtensions.cs
@@ -21,7 +21,12 @@ namespace osu.Game.Extensions
/// This is required as enum member names are not allowed to contain hyphens.
///
public static string ToCultureCode(this Language language)
- => language.ToString().Replace("_", "-");
+ {
+ if (language == Language.zh_hant)
+ return @"zh-tw";
+
+ return language.ToString().Replace("_", "-");
+ }
///
/// Attempts to parse the supplied to a value.
@@ -30,7 +35,15 @@ namespace osu.Game.Extensions
/// The parsed . Valid only if the return value of the method is .
/// Whether the parsing succeeded.
public static bool TryParseCultureCode(string cultureCode, out Language language)
- => Enum.TryParse(cultureCode.Replace("-", "_"), out language);
+ {
+ if (cultureCode == @"zh-tw")
+ {
+ language = Language.zh_hant;
+ return true;
+ }
+
+ return Enum.TryParse(cultureCode.Replace("-", "_"), out language);
+ }
///
/// Parses the that is specified in ,
diff --git a/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs b/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs
index b79eb4927f..3ace67f410 100644
--- a/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs
+++ b/osu.Game/Graphics/Backgrounds/BeatmapBackground.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Graphics.Backgrounds
[BackgroundDependencyLoader]
private void load(LargeTextureStore textures)
{
- Sprite.Texture = Beatmap?.Background ?? textures.Get(fallbackTextureName);
+ Sprite.Texture = Beatmap?.GetBackground() ?? textures.Get(fallbackTextureName);
}
public override bool Equals(Background other)
diff --git a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
index 07b5b53e0e..f92cfc2306 100644
--- a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
@@ -152,7 +152,6 @@ namespace osu.Game.Graphics.Containers
protected override void PopOut()
{
- base.PopOut();
previewTrackManager.StopAnyPlaying(this);
}
diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 8dd6eac7bb..27ff6b851d 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -1,17 +1,16 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using System;
using System.Diagnostics;
using System.Linq;
-using JetBrains.Annotations;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Layout;
+using osu.Framework.Logging;
+using osu.Framework.Threading;
using osu.Framework.Utils;
namespace osu.Game.Graphics.Containers
@@ -23,11 +22,35 @@ namespace osu.Game.Graphics.Containers
public partial class SectionsContainer : Container
where T : Drawable
{
- public Bindable SelectedSection { get; } = new Bindable();
+ public Bindable SelectedSection { get; } = new Bindable();
- private T lastClickedSection;
+ private T? lastClickedSection;
- public Drawable ExpandableHeader
+ protected override Container Content => scrollContentContainer;
+
+ private readonly UserTrackingScrollContainer scrollContainer;
+ private readonly Container headerBackgroundContainer;
+ private readonly MarginPadding originalSectionsMargin;
+
+ private Drawable? fixedHeader;
+
+ private Drawable? footer;
+ private Drawable? headerBackground;
+
+ private FlowContainer scrollContentContainer = null!;
+
+ private float? headerHeight, footerHeight;
+
+ private float? lastKnownScroll;
+
+ ///
+ /// The percentage of the container to consider the centre-point for deciding the active section (and scrolling to a requested section).
+ ///
+ private const float scroll_y_centre = 0.1f;
+
+ private Drawable? expandableHeader;
+
+ public Drawable? ExpandableHeader
{
get => expandableHeader;
set
@@ -42,11 +65,12 @@ namespace osu.Game.Graphics.Containers
if (value == null) return;
AddInternal(expandableHeader);
+
lastKnownScroll = null;
}
}
- public Drawable FixedHeader
+ public Drawable? FixedHeader
{
get => fixedHeader;
set
@@ -63,7 +87,7 @@ namespace osu.Game.Graphics.Containers
}
}
- public Drawable Footer
+ public Drawable? Footer
{
get => footer;
set
@@ -75,16 +99,17 @@ namespace osu.Game.Graphics.Containers
footer = value;
- if (value == null) return;
+ if (footer == null) return;
footer.Anchor |= Anchor.y2;
footer.Origin |= Anchor.y2;
+
scrollContainer.Add(footer);
lastKnownScroll = null;
}
}
- public Drawable HeaderBackground
+ public Drawable? HeaderBackground
{
get => headerBackground;
set
@@ -102,23 +127,6 @@ namespace osu.Game.Graphics.Containers
}
}
- protected override Container Content => scrollContentContainer;
-
- private readonly UserTrackingScrollContainer scrollContainer;
- private readonly Container headerBackgroundContainer;
- private readonly MarginPadding originalSectionsMargin;
- private Drawable expandableHeader, fixedHeader, footer, headerBackground;
- private FlowContainer scrollContentContainer;
-
- private float? headerHeight, footerHeight;
-
- private float? lastKnownScroll;
-
- ///
- /// The percentage of the container to consider the centre-point for deciding the active section (and scrolling to a requested section).
- ///
- private const float scroll_y_centre = 0.1f;
-
public SectionsContainer()
{
AddRangeInternal(new Drawable[]
@@ -150,31 +158,63 @@ namespace osu.Game.Graphics.Containers
footerHeight = null;
}
+ private ScheduledDelegate? scrollToTargetDelegate;
+
public void ScrollTo(Drawable target)
{
+ Logger.Log($"Scrolling to {target}..");
+
lastKnownScroll = null;
- // implementation similar to ScrollIntoView but a bit more nuanced.
- float top = scrollContainer.GetChildPosInContent(target);
+ float scrollTarget = getScrollTargetForDrawable(target);
- float bottomScrollExtent = scrollContainer.ScrollableExtent;
- float scrollTarget = top - scrollContainer.DisplayableContent * scroll_y_centre;
-
- if (scrollTarget > bottomScrollExtent)
+ if (scrollTarget > scrollContainer.ScrollableExtent)
scrollContainer.ScrollToEnd();
else
scrollContainer.ScrollTo(scrollTarget);
if (target is T section)
lastClickedSection = section;
+
+ // Content may load in as a scroll occurs, changing the scroll target we need to aim for.
+ // This scheduled operation ensures that we keep trying until actually arriving at the target.
+ scrollToTargetDelegate?.Cancel();
+ scrollToTargetDelegate = Scheduler.AddDelayed(() =>
+ {
+ if (scrollContainer.UserScrolling)
+ {
+ Logger.Log("Scroll operation interrupted by user scroll");
+ scrollToTargetDelegate?.Cancel();
+ scrollToTargetDelegate = null;
+ return;
+ }
+
+ if (Precision.AlmostEquals(scrollContainer.Current, scrollTarget, 1))
+ {
+ Logger.Log($"Finished scrolling to {target}!");
+ scrollToTargetDelegate?.Cancel();
+ scrollToTargetDelegate = null;
+ return;
+ }
+
+ if (!Precision.AlmostEquals(getScrollTargetForDrawable(target), scrollTarget, 1))
+ {
+ Logger.Log($"Reattempting scroll to {target} due to change in position");
+ ScrollTo(target);
+ }
+ }, 50, true);
+ }
+
+ private float getScrollTargetForDrawable(Drawable target)
+ {
+ // implementation similar to ScrollIntoView but a bit more nuanced.
+ return scrollContainer.GetChildPosInContent(target) - scrollContainer.DisplayableContent * scroll_y_centre;
}
public void ScrollToTop() => scrollContainer.ScrollTo(0);
- [NotNull]
protected virtual UserTrackingScrollContainer CreateScrollContainer() => new UserTrackingScrollContainer();
- [NotNull]
protected virtual FlowContainer CreateScrollContentContainer() =>
new FillFlowContainer
{
diff --git a/osu.Game/Graphics/Sprites/OsuSpriteText.cs b/osu.Game/Graphics/Sprites/OsuSpriteText.cs
index e149e0abfb..afbec0eab4 100644
--- a/osu.Game/Graphics/Sprites/OsuSpriteText.cs
+++ b/osu.Game/Graphics/Sprites/OsuSpriteText.cs
@@ -3,12 +3,19 @@
#nullable disable
+using System;
using osu.Framework.Graphics.Sprites;
namespace osu.Game.Graphics.Sprites
{
public partial class OsuSpriteText : SpriteText
{
+ [Obsolete("Use TruncatingSpriteText instead.")]
+ public new bool Truncate
+ {
+ set => throw new InvalidOperationException($"Use {nameof(TruncatingSpriteText)} instead.");
+ }
+
public OsuSpriteText()
{
Shadow = true;
diff --git a/osu.Game/Graphics/Sprites/TruncatingSpriteText.cs b/osu.Game/Graphics/Sprites/TruncatingSpriteText.cs
new file mode 100644
index 0000000000..46abdbf09e
--- /dev/null
+++ b/osu.Game/Graphics/Sprites/TruncatingSpriteText.cs
@@ -0,0 +1,29 @@
+// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
+
+namespace osu.Game.Graphics.Sprites
+{
+ ///
+ /// A derived version of which automatically shows non-truncated text in tooltip when required.
+ ///
+ public sealed partial class TruncatingSpriteText : OsuSpriteText, IHasTooltip
+ {
+ ///
+ /// Whether a tooltip should be shown with non-truncated text on hover.
+ ///
+ public bool ShowTooltip { get; init; } = true;
+
+ public LocalisableString TooltipText => Text;
+
+ public override bool HandlePositionalInput => IsTruncated && ShowTooltip;
+
+ public TruncatingSpriteText()
+ {
+ ((SpriteText)this).Truncate = true;
+ }
+ }
+}
diff --git a/osu.Game/Graphics/UserInterface/FPSCounter.cs b/osu.Game/Graphics/UserInterface/FPSCounter.cs
index 9dbeba6449..c1ef573848 100644
--- a/osu.Game/Graphics/UserInterface/FPSCounter.cs
+++ b/osu.Game/Graphics/UserInterface/FPSCounter.cs
@@ -167,9 +167,12 @@ namespace osu.Game.Graphics.UserInterface
{
base.Update();
+ double elapsedDrawFrameTime = drawClock.ElapsedFrameTime;
+ double elapsedUpdateFrameTime = updateClock.ElapsedFrameTime;
+
// If the game goes into a suspended state (ie. debugger attached or backgrounded on a mobile device)
// we want to ignore really long periods of no processing.
- if (updateClock.ElapsedFrameTime > 10000)
+ if (elapsedUpdateFrameTime > 10000)
return;
mainContent.Width = Math.Max(mainContent.Width, counters.DrawWidth);
@@ -178,17 +181,17 @@ namespace osu.Game.Graphics.UserInterface
// frame limiter (we want to show the FPS as it's changing, even if it isn't an outlier).
bool aimRatesChanged = updateAimFPS();
- bool hasUpdateSpike = displayedFrameTime < spike_time_ms && updateClock.ElapsedFrameTime > spike_time_ms;
+ bool hasUpdateSpike = displayedFrameTime < spike_time_ms && elapsedUpdateFrameTime > spike_time_ms;
// use elapsed frame time rather then FramesPerSecond to better catch stutter frames.
- bool hasDrawSpike = displayedFpsCount > (1000 / spike_time_ms) && drawClock.ElapsedFrameTime > spike_time_ms;
+ bool hasDrawSpike = displayedFpsCount > (1000 / spike_time_ms) && elapsedDrawFrameTime > spike_time_ms;
const float damp_time = 100;
- displayedFrameTime = Interpolation.DampContinuously(displayedFrameTime, updateClock.ElapsedFrameTime, hasUpdateSpike ? 0 : damp_time, updateClock.ElapsedFrameTime);
+ displayedFrameTime = Interpolation.DampContinuously(displayedFrameTime, elapsedUpdateFrameTime, hasUpdateSpike ? 0 : damp_time, elapsedUpdateFrameTime);
if (hasDrawSpike)
// show spike time using raw elapsed value, to account for `FramesPerSecond` being so averaged spike frames don't show.
- displayedFpsCount = 1000 / drawClock.ElapsedFrameTime;
+ displayedFpsCount = 1000 / elapsedDrawFrameTime;
else
displayedFpsCount = Interpolation.DampContinuously(displayedFpsCount, drawClock.FramesPerSecond, damp_time, Time.Elapsed);
diff --git a/osu.Game/Graphics/UserInterface/MenuItemType.cs b/osu.Game/Graphics/UserInterface/MenuItemType.cs
index 1eb45d6b1c..0269f2cb57 100644
--- a/osu.Game/Graphics/UserInterface/MenuItemType.cs
+++ b/osu.Game/Graphics/UserInterface/MenuItemType.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
namespace osu.Game.Graphics.UserInterface
{
public enum MenuItemType
diff --git a/osu.Game/Graphics/UserInterface/OsuDropdown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
index 3230bb0569..b530172f3e 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
@@ -335,12 +335,11 @@ namespace osu.Game.Graphics.UserInterface
{
new Drawable[]
{
- Text = new OsuSpriteText
+ Text = new TruncatingSpriteText
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
RelativeSizeAxes = Axes.X,
- Truncate = true,
},
Icon = new SpriteIcon
{
diff --git a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
index 63c98d7838..9de9eceb07 100644
--- a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
@@ -16,6 +16,7 @@ using osu.Framework.Input;
using osu.Framework.Input.Events;
using osu.Framework.Localisation;
using osu.Framework.Platform;
+using osu.Game.Localisation;
namespace osu.Game.Graphics.UserInterface
{
@@ -112,7 +113,7 @@ namespace osu.Game.Graphics.UserInterface
private partial class CapsWarning : SpriteIcon, IHasTooltip
{
- public LocalisableString TooltipText => "caps lock is active";
+ public LocalisableString TooltipText => CommonStrings.CapsLockIsActive;
public CapsWarning()
{
diff --git a/osu.Game/Graphics/UserInterface/SelectionState.cs b/osu.Game/Graphics/UserInterface/SelectionState.cs
index edabf0547b..c85b2ad3ab 100644
--- a/osu.Game/Graphics/UserInterface/SelectionState.cs
+++ b/osu.Game/Graphics/UserInterface/SelectionState.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
namespace osu.Game.Graphics.UserInterface
{
public enum SelectionState
diff --git a/osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs b/osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs
index 7bd083f9d5..fb0a66cb8d 100644
--- a/osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Localisation;
using osu.Game.Graphics.Sprites;
using osu.Game.Overlays;
using osu.Game.Overlays.Mods;
@@ -37,6 +38,14 @@ namespace osu.Game.Graphics.UserInterface
set => textBox.HoldFocus = value;
}
+ public LocalisableString PlaceholderText
+ {
+ get => textBox.PlaceholderText;
+ set => textBox.PlaceholderText = value;
+ }
+
+ public new bool HasFocus => textBox.HasFocus;
+
public void TakeFocus() => textBox.TakeFocus();
public void KillFocus() => textBox.KillFocus();
diff --git a/osu.Game/Graphics/UserInterface/TernaryState.cs b/osu.Game/Graphics/UserInterface/TernaryState.cs
index effbe624c3..d4de28044f 100644
--- a/osu.Game/Graphics/UserInterface/TernaryState.cs
+++ b/osu.Game/Graphics/UserInterface/TernaryState.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
namespace osu.Game.Graphics.UserInterface
{
///
diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index d580eea248..fdd96d3890 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -101,6 +101,10 @@ namespace osu.Game.Input.Bindings
new KeyBinding(new[] { InputKey.Control, InputKey.J }, GlobalAction.EditorFlipVertically),
new KeyBinding(new[] { InputKey.Control, InputKey.Alt, InputKey.MouseWheelDown }, GlobalAction.EditorDecreaseDistanceSpacing),
new KeyBinding(new[] { InputKey.Control, InputKey.Alt, InputKey.MouseWheelUp }, GlobalAction.EditorIncreaseDistanceSpacing),
+ // Framework automatically converts wheel up/down to left/right when shift is held.
+ // See https://github.com/ppy/osu-framework/blob/master/osu.Framework/Input/StateChanges/MouseScrollRelativeInput.cs#L37-L38.
+ new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.MouseWheelRight }, GlobalAction.EditorCyclePreviousBeatSnapDivisor),
+ new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.MouseWheelLeft }, GlobalAction.EditorCycleNextBeatSnapDivisor),
};
public IEnumerable InGameKeyBindings => new[]
@@ -355,6 +359,12 @@ namespace osu.Game.Input.Bindings
ToggleProfile,
[LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorCloneSelection))]
- EditorCloneSelection
+ EditorCloneSelection,
+
+ [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorCyclePreviousBeatSnapDivisor))]
+ EditorCyclePreviousBeatSnapDivisor,
+
+ [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorCycleNextBeatSnapDivisor))]
+ EditorCycleNextBeatSnapDivisor,
}
}
diff --git a/osu.Game/Localisation/AccountCreationStrings.cs b/osu.Game/Localisation/AccountCreationStrings.cs
new file mode 100644
index 0000000000..2183df9b52
--- /dev/null
+++ b/osu.Game/Localisation/AccountCreationStrings.cs
@@ -0,0 +1,54 @@
+// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Localisation;
+
+namespace osu.Game.Localisation
+{
+ public static class AccountCreationStrings
+ {
+ private const string prefix = @"osu.Game.Resources.Localisation.AccountCreation";
+
+ ///
+ /// "New player registration"
+ ///
+ public static LocalisableString NewPlayerRegistration => new TranslatableString(getKey(@"new_player_registration"), @"New player registration");
+
+ ///
+ /// "Let's get you started"
+ ///
+ public static LocalisableString LetsGetYouStarted => new TranslatableString(getKey(@"lets_get_you_started"), @"Let's get you started");
+
+ ///
+ /// "Let's create an account!"
+ ///
+ public static LocalisableString LetsCreateAnAccount => new TranslatableString(getKey(@"lets_create_an_account"), @"Let's create an account!");
+
+ ///
+ /// "Help, I can't access my account!"
+ ///
+ public static LocalisableString MultiAccountWarningHelp => new TranslatableString(getKey(@"multi_account_warning_help"), @"Help, I can't access my account!");
+
+ ///
+ /// "I understand. This account isn't for me."
+ ///
+ public static LocalisableString MultiAccountWarningAccept => new TranslatableString(getKey(@"multi_account_warning_accept"), @"I understand. This account isn't for me.");
+
+ ///
+ /// "This will be your public presence. No profanity, no impersonation. Avoid exposing your own personal details, too!"
+ ///
+ public static LocalisableString UsernameDescription => new TranslatableString(getKey(@"username_description"), @"This will be your public presence. No profanity, no impersonation. Avoid exposing your own personal details, too!");
+
+ ///
+ /// "Will be used for notifications, account verification and in the case you forget your password. No spam, ever."
+ ///
+ public static LocalisableString EmailDescription1 => new TranslatableString(getKey(@"email_description_1"), @"Will be used for notifications, account verification and in the case you forget your password. No spam, ever.");
+
+ ///
+ /// " Make sure to get it right!"
+ ///
+ public static LocalisableString EmailDescription2 => new TranslatableString(getKey(@"email_description_2"), @" Make sure to get it right!");
+
+ private static string getKey(string key) => $@"{prefix}:{key}";
+ }
+}
diff --git a/osu.Game/Localisation/CommonStrings.cs b/osu.Game/Localisation/CommonStrings.cs
index fed7b6cab7..c9223db246 100644
--- a/osu.Game/Localisation/CommonStrings.cs
+++ b/osu.Game/Localisation/CommonStrings.cs
@@ -154,6 +154,11 @@ namespace osu.Game.Localisation
///
public static LocalisableString Exit => new TranslatableString(getKey(@"exit"), @"Exit");
+ ///
+ /// "Caps lock is active"
+ ///
+ public static LocalisableString CapsLockIsActive => new TranslatableString(getKey(@"caps_lock_is_active"), @"Caps lock is active");
+
///
/// "Revert to default"
///
diff --git a/osu.Game/Localisation/EditorStrings.cs b/osu.Game/Localisation/EditorStrings.cs
index 20258b9c35..077bd92d4f 100644
--- a/osu.Game/Localisation/EditorStrings.cs
+++ b/osu.Game/Localisation/EditorStrings.cs
@@ -109,6 +109,11 @@ namespace osu.Game.Localisation
///
public static LocalisableString RotationSnapped(float newRotation) => new TranslatableString(getKey(@"rotation_snapped"), @"{0:0}° (snapped)", newRotation);
+ ///
+ /// "Limit distance snap placement to current time"
+ ///
+ public static LocalisableString LimitedDistanceSnap => new TranslatableString(getKey(@"limited_distance_snap_grid"), @"Limit distance snap placement to current time");
+
private static string getKey(string key) => $@"{prefix}:{key}";
}
}
diff --git a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
index 303dbb6f46..aa608a603b 100644
--- a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
+++ b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
@@ -279,6 +279,16 @@ namespace osu.Game.Localisation
///
public static LocalisableString EditorDecreaseDistanceSpacing => new TranslatableString(getKey(@"editor_decrease_distance_spacing"), @"Decrease distance spacing");
+ ///
+ /// "Cycle previous beat snap divisor"
+ ///
+ public static LocalisableString EditorCyclePreviousBeatSnapDivisor => new TranslatableString(getKey(@"editor_cycle_previous_beat_snap_divisor"), @"Cycle previous beat snap divisor");
+
+ ///
+ /// "Cycle next beat snap divisor"
+ ///
+ public static LocalisableString EditorCycleNextBeatSnapDivisor => new TranslatableString(getKey(@"editor_cycle_next_snap_divisor"), @"Cycle next beat snap divisor");
+
///
/// "Toggle skin editor"
///
diff --git a/osu.Game/Localisation/Language.cs b/osu.Game/Localisation/Language.cs
index 6a4e5110e6..711e95486f 100644
--- a/osu.Game/Localisation/Language.cs
+++ b/osu.Game/Localisation/Language.cs
@@ -22,6 +22,9 @@ namespace osu.Game.Localisation
[Description(@"Български")]
bg,
+ [Description(@"Català")]
+ ca,
+
[Description(@"Česky")]
cs,
@@ -37,12 +40,27 @@ namespace osu.Game.Localisation
[Description(@"español")]
es,
+ // TODO: Requires Arabic glyphs to be added to resources (and possibly also RTL support).
+ // [Description(@"فارسی")]
+ // fa_ir,
+
[Description(@"Suomi")]
fi,
+ // TODO: Doesn't work as appropriate satellite assemblies aren't copied from resources (see: https://github.com/ppy/osu/discussions/18851#discussioncomment-3042170)
+ // [Description(@"Filipino")]
+ // fil,
+
[Description(@"français")]
fr,
+ // TODO: Requires Hebrew glyphs to be added to resources (and possibly also RTL support).
+ // [Description(@"עברית")]
+ // he,
+
+ [Description(@"Hrvatski")]
+ hr_hr,
+
[Description(@"Magyar")]
hu,
@@ -58,6 +76,15 @@ namespace osu.Game.Localisation
[Description(@"한국어")]
ko,
+ [Description(@"Lietuvių")]
+ lt,
+
+ [Description(@"Latviešu")]
+ lv_lv,
+
+ [Description(@"Melayu")]
+ ms_my,
+
[Description(@"Nederlands")]
nl,
@@ -79,12 +106,28 @@ namespace osu.Game.Localisation
[Description(@"Русский")]
ru,
+ // TODO: Requires Sinhala glyphs to be added to resources.
+ // Additionally, no translations available yet.
+ // [Description(@"සිංහල")]
+ // si_lk,
+
[Description(@"Slovenčina")]
sk,
+ [Description(@"Slovenščina")]
+ sl,
+
+ [Description(@"Српски")]
+ sr,
+
[Description(@"Svenska")]
sv,
+ // Tajik has no associated localisations yet, and is not supported on Windows versions <10.
+ // TODO: update language mapping in osu-resources to redirect tg-TJ to tg-Cyrl-TJ (which is supported on earlier Windows versions)
+ // [Description(@"Тоҷикӣ")]
+ // tg_tj,
+
[Description(@"ไทย")]
th,
diff --git a/osu.Game/Localisation/LoginPanelStrings.cs b/osu.Game/Localisation/LoginPanelStrings.cs
new file mode 100644
index 0000000000..19b0ca3b52
--- /dev/null
+++ b/osu.Game/Localisation/LoginPanelStrings.cs
@@ -0,0 +1,49 @@
+// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Localisation;
+
+namespace osu.Game.Localisation
+{
+ public static class LoginPanelStrings
+ {
+ private const string prefix = @"osu.Game.Resources.Localisation.LoginPanel";
+
+ ///
+ /// "Do not disturb"
+ ///
+ public static LocalisableString DoNotDisturb => new TranslatableString(getKey(@"do_not_disturb"), @"Do not disturb");
+
+ ///
+ /// "Appear offline"
+ ///
+ public static LocalisableString AppearOffline => new TranslatableString(getKey(@"appear_offline"), @"Appear offline");
+
+ ///
+ /// "Signed in"
+ ///
+ public static LocalisableString SignedIn => new TranslatableString(getKey(@"signed_in"), @"Signed in");
+
+ ///
+ /// "Account"
+ ///
+ public static LocalisableString Account => new TranslatableString(getKey(@"account"), @"Account");
+
+ ///
+ /// "Remember username"
+ ///
+ public static LocalisableString RememberUsername => new TranslatableString(getKey(@"remember_username"), @"Remember username");
+
+ ///
+ /// "Stay signed in"
+ ///
+ public static LocalisableString StaySignedIn => new TranslatableString(getKey(@"stay_signed_in"), @"Stay signed in");
+
+ ///
+ /// "Register"
+ ///
+ public static LocalisableString Register => new TranslatableString(getKey(@"register"), @"Register");
+
+ private static string getKey(string key) => $@"{prefix}:{key}";
+ }
+}
diff --git a/osu.Game/Localisation/ModSelectOverlayStrings.cs b/osu.Game/Localisation/ModSelectOverlayStrings.cs
index f11c52ee20..05dcf138d7 100644
--- a/osu.Game/Localisation/ModSelectOverlayStrings.cs
+++ b/osu.Game/Localisation/ModSelectOverlayStrings.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Localisation;
@@ -39,6 +39,11 @@ namespace osu.Game.Localisation
///
public static LocalisableString UseCurrentMods => new TranslatableString(getKey(@"use_current_mods"), @"Use current mods");
+ ///
+ /// "tab to search..."
+ ///
+ public static LocalisableString TabToSearch => new TranslatableString(getKey(@"tab_to_search"), @"tab to search...");
+
private static string getKey(string key) => $@"{prefix}:{key}";
}
-}
+}
\ No newline at end of file
diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 94bb77d6ec..4f586c8fff 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -18,6 +18,7 @@ using osu.Framework.Extensions.ObjectExtensions;
using osu.Framework.Graphics;
using osu.Framework.Logging;
using osu.Game.Configuration;
+using osu.Game.Localisation;
using osu.Game.Online.API.Requests;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Notifications;
@@ -28,6 +29,7 @@ namespace osu.Game.Online.API
{
public partial class APIAccess : Component, IAPIProvider
{
+ private readonly OsuGameBase game;
private readonly OsuConfigManager config;
private readonly string versionHash;
@@ -52,6 +54,8 @@ namespace osu.Game.Online.API
public IBindableList Friends => friends;
public IBindable Activity => activity;
+ public Language Language => game.CurrentLanguage.Value;
+
private Bindable localUser { get; } = new Bindable(createGuestUser());
private BindableList friends { get; } = new BindableList();
@@ -64,8 +68,9 @@ namespace osu.Game.Online.API
private readonly Logger log;
- public APIAccess(OsuConfigManager config, EndpointConfiguration endpointConfiguration, string versionHash)
+ public APIAccess(OsuGameBase game, OsuConfigManager config, EndpointConfiguration endpointConfiguration, string versionHash)
{
+ this.game = game;
this.config = config;
this.versionHash = versionHash;
diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index dc6a3fe3d5..cd6e8df754 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -9,6 +9,7 @@ using JetBrains.Annotations;
using Newtonsoft.Json;
using osu.Framework.IO.Network;
using osu.Framework.Logging;
+using osu.Game.Extensions;
using osu.Game.Online.API.Requests.Responses;
namespace osu.Game.Online.API
@@ -116,10 +117,11 @@ namespace osu.Game.Online.API
WebRequest.Failed += Fail;
WebRequest.AllowRetryOnTimeout = false;
- WebRequest.AddHeader("x-api-version", API.APIVersion.ToString(CultureInfo.InvariantCulture));
+ WebRequest.AddHeader(@"Accept-Language", API.Language.ToCultureCode());
+ WebRequest.AddHeader(@"x-api-version", API.APIVersion.ToString(CultureInfo.InvariantCulture));
if (!string.IsNullOrEmpty(API.AccessToken))
- WebRequest.AddHeader("Authorization", $"Bearer {API.AccessToken}");
+ WebRequest.AddHeader(@"Authorization", $@"Bearer {API.AccessToken}");
if (isFailing) return;
diff --git a/osu.Game/Online/API/APIRequestCompletionState.cs b/osu.Game/Online/API/APIRequestCompletionState.cs
index 52eb669a7d..84c9974dd8 100644
--- a/osu.Game/Online/API/APIRequestCompletionState.cs
+++ b/osu.Game/Online/API/APIRequestCompletionState.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
namespace osu.Game.Online.API
{
public enum APIRequestCompletionState
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index abe2755654..16afef8e30 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -8,6 +8,7 @@ using System.Threading;
using System.Threading.Tasks;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
+using osu.Game.Localisation;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Notifications;
using osu.Game.Tests;
@@ -29,6 +30,8 @@ namespace osu.Game.Online.API
public Bindable Activity { get; } = new Bindable();
+ public Language Language => Language.en;
+
public string AccessToken => "token";
public bool IsLoggedIn => State.Value == APIState.Online;
diff --git a/osu.Game/Online/API/IAPIProvider.cs b/osu.Game/Online/API/IAPIProvider.cs
index 6054effaa1..a1d7006c8c 100644
--- a/osu.Game/Online/API/IAPIProvider.cs
+++ b/osu.Game/Online/API/IAPIProvider.cs
@@ -4,6 +4,7 @@
using System;
using System.Threading.Tasks;
using osu.Framework.Bindables;
+using osu.Game.Localisation;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Notifications;
using osu.Game.Users;
@@ -27,6 +28,11 @@ namespace osu.Game.Online.API
///
IBindable Activity { get; }
+ ///
+ /// The language supplied by this provider to API requests.
+ ///
+ Language Language { get; }
+
///
/// Retrieve the OAuth access token.
///
diff --git a/osu.Game/Online/API/Requests/GetUsersRequest.cs b/osu.Game/Online/API/Requests/GetUsersRequest.cs
index b57bb215aa..6f7e9c07d2 100644
--- a/osu.Game/Online/API/Requests/GetUsersRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUsersRequest.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using System;
namespace osu.Game.Online.API.Requests
diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
index 7d6740ee46..902b651be9 100644
--- a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
@@ -63,6 +63,16 @@ namespace osu.Game.Online.API.Requests.Responses
set => Length = TimeSpan.FromSeconds(value).TotalMilliseconds;
}
+ [JsonIgnore]
+ public double HitLength { get; set; }
+
+ [JsonProperty(@"hit_length")]
+ private double hitLengthInSeconds
+ {
+ get => TimeSpan.FromMilliseconds(HitLength).TotalSeconds;
+ set => HitLength = TimeSpan.FromSeconds(value).TotalMilliseconds;
+ }
+
[JsonProperty(@"convert")]
public bool Convert { get; set; }
diff --git a/osu.Game/Online/Chat/ChannelType.cs b/osu.Game/Online/Chat/ChannelType.cs
index a864e20830..bd628e90c4 100644
--- a/osu.Game/Online/Chat/ChannelType.cs
+++ b/osu.Game/Online/Chat/ChannelType.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
namespace osu.Game.Online.Chat
{
public enum ChannelType
diff --git a/osu.Game/Online/Leaderboards/LeaderboardState.cs b/osu.Game/Online/Leaderboards/LeaderboardState.cs
index abc0ef4f19..6b07500a98 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardState.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardState.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
namespace osu.Game.Online.Leaderboards
{
public enum LeaderboardState
diff --git a/osu.Game/Online/Multiplayer/ForceGameplayStartCountdown.cs b/osu.Game/Online/Multiplayer/ForceGameplayStartCountdown.cs
index bbfc5a02c6..c497601e37 100644
--- a/osu.Game/Online/Multiplayer/ForceGameplayStartCountdown.cs
+++ b/osu.Game/Online/Multiplayer/ForceGameplayStartCountdown.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using MessagePack;
namespace osu.Game.Online.Multiplayer
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerServer.cs
index cc7a474ce7..d3a070af6d 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerServer.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
namespace osu.Game.Online.Multiplayer
{
///
diff --git a/osu.Game/Online/Multiplayer/MultiplayerUserState.cs b/osu.Game/Online/Multiplayer/MultiplayerUserState.cs
index 0f7dc6b8cd..d1369a7970 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerUserState.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerUserState.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
namespace osu.Game.Online.Multiplayer
{
public enum MultiplayerUserState
diff --git a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
index 1d496cc636..cce633d46a 100644
--- a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
+++ b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Online.Rooms
{
var beatmap = task.GetResultSafely();
- if (SelectedItem.Value?.Beatmap.OnlineID == beatmap.OnlineID)
+ if (beatmap != null && SelectedItem.Value?.Beatmap.OnlineID == beatmap.OnlineID)
{
selectedBeatmap = beatmap;
beginTracking();
diff --git a/osu.Game/Online/Spectator/SpectatedUserState.cs b/osu.Game/Online/Spectator/SpectatedUserState.cs
index edf0859a33..0f0a3068b8 100644
--- a/osu.Game/Online/Spectator/SpectatedUserState.cs
+++ b/osu.Game/Online/Spectator/SpectatedUserState.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
namespace osu.Game.Online.Spectator
{
public enum SpectatedUserState
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 3768dad370..a80639d4ff 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -6,6 +6,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
+using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
@@ -28,6 +29,7 @@ using osu.Framework.Input.Events;
using osu.Framework.Input.Handlers.Tablet;
using osu.Framework.Localisation;
using osu.Framework.Logging;
+using osu.Framework.Platform;
using osu.Framework.Screens;
using osu.Framework.Threading;
using osu.Game.Beatmaps;
@@ -281,6 +283,52 @@ namespace osu.Game
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+ private readonly List dragDropFiles = new List();
+ private ScheduledDelegate dragDropImportSchedule;
+
+ public override void SetHost(GameHost host)
+ {
+ base.SetHost(host);
+
+ if (host.Window is SDL2Window sdlWindow)
+ {
+ sdlWindow.DragDrop += path =>
+ {
+ // on macOS/iOS, URL associations are handled via SDL_DROPFILE events.
+ if (path.StartsWith(OSU_PROTOCOL, StringComparison.Ordinal))
+ {
+ HandleLink(path);
+ return;
+ }
+
+ lock (dragDropFiles)
+ {
+ dragDropFiles.Add(path);
+
+ Logger.Log($@"Adding ""{Path.GetFileName(path)}"" for import");
+
+ // File drag drop operations can potentially trigger hundreds or thousands of these calls on some platforms.
+ // In order to avoid spawning multiple import tasks for a single drop operation, debounce a touch.
+ dragDropImportSchedule?.Cancel();
+ dragDropImportSchedule = Scheduler.AddDelayed(handlePendingDragDropImports, 100);
+ }
+ };
+ }
+ }
+
+ private void handlePendingDragDropImports()
+ {
+ lock (dragDropFiles)
+ {
+ Logger.Log($"Handling batch import of {dragDropFiles.Count} files");
+
+ string[] paths = dragDropFiles.ToArray();
+ dragDropFiles.Clear();
+
+ Task.Factory.StartNew(() => Import(paths), TaskCreationOptions.LongRunning);
+ }
+ }
+
[BackgroundDependencyLoader]
private void load()
{
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index c55b6c249f..63efe0e2c8 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -14,6 +14,7 @@ using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Track;
using osu.Framework.Bindables;
+using osu.Framework.Configuration;
using osu.Framework.Development;
using osu.Framework.Extensions;
using osu.Framework.Graphics;
@@ -27,6 +28,7 @@ using osu.Framework.Input.Handlers.Mouse;
using osu.Framework.Input.Handlers.Tablet;
using osu.Framework.Input.Handlers.Touch;
using osu.Framework.IO.Stores;
+using osu.Framework.Localisation;
using osu.Framework.Logging;
using osu.Framework.Platform;
using osu.Framework.Timing;
@@ -36,11 +38,13 @@ using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Beatmaps.Formats;
using osu.Game.Configuration;
using osu.Game.Database;
+using osu.Game.Extensions;
using osu.Game.Graphics;
using osu.Game.Graphics.Cursor;
using osu.Game.Input;
using osu.Game.Input.Bindings;
using osu.Game.IO;
+using osu.Game.Localisation;
using osu.Game.Online;
using osu.Game.Online.API;
using osu.Game.Online.Chat;
@@ -157,6 +161,11 @@ namespace osu.Game
protected Storage Storage { get; set; }
+ ///
+ /// The language in which the game is currently displayed in.
+ ///
+ public Bindable CurrentLanguage { get; } = new Bindable();
+
protected Bindable Beatmap { get; private set; } // cached via load() method
///
@@ -216,6 +225,10 @@ namespace osu.Game
private readonly BindableNumber globalTrackVolumeAdjust = new BindableNumber(global_track_volume_adjust);
+ private Bindable frameworkLocale = null!;
+
+ private IBindable localisationParameters = null!;
+
///
/// Number of unhandled exceptions to allow before aborting execution.
///
@@ -238,7 +251,7 @@ namespace osu.Game
}
[BackgroundDependencyLoader]
- private void load(ReadableKeyCombinationProvider keyCombinationProvider)
+ private void load(ReadableKeyCombinationProvider keyCombinationProvider, FrameworkConfigManager frameworkConfig)
{
try
{
@@ -283,7 +296,15 @@ namespace osu.Game
MessageFormatter.WebsiteRootUrl = endpoints.WebsiteRootUrl;
- dependencies.CacheAs(API ??= new APIAccess(LocalConfig, endpoints, VersionHash));
+ frameworkLocale = frameworkConfig.GetBindable(FrameworkSetting.Locale);
+ frameworkLocale.BindValueChanged(_ => updateLanguage());
+
+ localisationParameters = Localisation.CurrentParameters.GetBoundCopy();
+ localisationParameters.BindValueChanged(_ => updateLanguage(), true);
+
+ CurrentLanguage.BindValueChanged(val => frameworkLocale.Value = val.NewValue.ToCultureCode());
+
+ dependencies.CacheAs(API ??= new APIAccess(this, LocalConfig, endpoints, VersionHash));
var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures);
@@ -394,6 +415,8 @@ namespace osu.Game
Beatmap.BindValueChanged(onBeatmapChanged);
}
+ private void updateLanguage() => CurrentLanguage.Value = LanguageExtensions.GetLanguageFor(frameworkLocale.Value, localisationParameters.Value);
+
private void addFilesWarning()
{
var realmStore = new RealmFileStore(realm, Storage);
diff --git a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
index 219cbe7eef..9ad507d82a 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
@@ -17,6 +17,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
+using osu.Game.Localisation;
using osu.Game.Online.API;
using osu.Game.Overlays.Settings;
using osu.Game.Resources.Localisation.Web;
@@ -71,7 +72,7 @@ namespace osu.Game.Overlays.AccountCreation
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Font = OsuFont.GetFont(size: 20),
- Text = "Let's create an account!",
+ Text = AccountCreationStrings.LetsCreateAnAccount
},
usernameTextBox = new OsuTextBox
{
@@ -86,7 +87,7 @@ namespace osu.Game.Overlays.AccountCreation
},
emailTextBox = new OsuTextBox
{
- PlaceholderText = "email address",
+ PlaceholderText = ModelValidationStrings.UserAttributesUserEmail.ToLower(),
RelativeSizeAxes = Axes.X,
TabbableContentContainer = this
},
@@ -118,7 +119,7 @@ namespace osu.Game.Overlays.AccountCreation
AutoSizeAxes = Axes.Y,
Child = new SettingsButton
{
- Text = "Register",
+ Text = LoginPanelStrings.Register,
Margin = new MarginPadding { Vertical = 20 },
Action = performRegistration
}
@@ -132,10 +133,10 @@ namespace osu.Game.Overlays.AccountCreation
textboxes = new[] { usernameTextBox, emailTextBox, passwordTextBox };
- usernameDescription.AddText("This will be your public presence. No profanity, no impersonation. Avoid exposing your own personal details, too!");
+ usernameDescription.AddText(AccountCreationStrings.UsernameDescription);
- emailAddressDescription.AddText("Will be used for notifications, account verification and in the case you forget your password. No spam, ever.");
- emailAddressDescription.AddText(" Make sure to get it right!", cp => cp.Font = cp.Font.With(Typeface.Torus, weight: FontWeight.Bold));
+ emailAddressDescription.AddText(AccountCreationStrings.EmailDescription1);
+ emailAddressDescription.AddText(AccountCreationStrings.EmailDescription2, cp => cp.Font = cp.Font.With(Typeface.Torus, weight: FontWeight.Bold));
passwordDescription.AddText("At least ");
characterCheckText = passwordDescription.AddText("8 characters long");
diff --git a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
index a833a871f9..0fbf6ba59e 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
@@ -17,6 +17,7 @@ using osu.Game.Overlays.Settings;
using osu.Game.Screens.Menu;
using osuTK;
using osuTK.Graphics;
+using osu.Game.Localisation;
namespace osu.Game.Overlays.AccountCreation
{
@@ -101,13 +102,13 @@ namespace osu.Game.Overlays.AccountCreation
},
new SettingsButton
{
- Text = "Help, I can't access my account!",
+ Text = AccountCreationStrings.MultiAccountWarningHelp,
Margin = new MarginPadding { Top = 50 },
Action = () => game?.OpenUrlExternally(help_centre_url)
},
new DangerousSettingsButton
{
- Text = "I understand. This account isn't for me.",
+ Text = AccountCreationStrings.MultiAccountWarningAccept,
Action = () => this.Push(new ScreenEntry())
},
furtherAssistance = new LinkFlowContainer(cp => cp.Font = cp.Font.With(size: 12))
diff --git a/osu.Game/Overlays/AccountCreation/ScreenWelcome.cs b/osu.Game/Overlays/AccountCreation/ScreenWelcome.cs
index 4becb225f8..610b9ee282 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenWelcome.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenWelcome.cs
@@ -1,9 +1,8 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using osu.Framework.Allocation;
+using osu.Framework.Extensions.LocalisationExtensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Screens;
@@ -12,6 +11,7 @@ using osu.Game.Graphics.Sprites;
using osu.Game.Overlays.Settings;
using osu.Game.Screens.Menu;
using osuTK;
+using osu.Game.Localisation;
namespace osu.Game.Overlays.AccountCreation
{
@@ -46,18 +46,18 @@ namespace osu.Game.Overlays.AccountCreation
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Font = OsuFont.GetFont(size: 24, weight: FontWeight.Light),
- Text = "New Player Registration",
+ Text = AccountCreationStrings.NewPlayerRegistration.ToTitle(),
},
new OsuSpriteText
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Font = OsuFont.GetFont(size: 12),
- Text = "let's get you started",
+ Text = AccountCreationStrings.LetsGetYouStarted.ToLower(),
},
new SettingsButton
{
- Text = "Let's create an account!",
+ Text = AccountCreationStrings.LetsCreateAnAccount,
Margin = new MarginPadding { Vertical = 120 },
Action = () => this.Push(new ScreenWarning())
}
diff --git a/osu.Game/Overlays/AccountCreationOverlay.cs b/osu.Game/Overlays/AccountCreationOverlay.cs
index 6f79316670..ef2e055eae 100644
--- a/osu.Game/Overlays/AccountCreationOverlay.cs
+++ b/osu.Game/Overlays/AccountCreationOverlay.cs
@@ -90,7 +90,6 @@ namespace osu.Game.Overlays
protected override void PopIn()
{
- base.PopIn();
this.FadeIn(transition_time, Easing.OutQuint);
if (welcomeScreen.GetChildScreen() != null)
diff --git a/osu.Game/Overlays/BeatmapSet/BasicStats.cs b/osu.Game/Overlays/BeatmapSet/BasicStats.cs
index 4a9a3d8089..0b1befe7b9 100644
--- a/osu.Game/Overlays/BeatmapSet/BasicStats.cs
+++ b/osu.Game/Overlays/BeatmapSet/BasicStats.cs
@@ -58,23 +58,25 @@ namespace osu.Game.Overlays.BeatmapSet
private void updateDisplay()
{
- bpm.Value = BeatmapSet?.BPM.ToLocalisableString(@"0.##") ?? (LocalisableString)"-";
-
if (beatmapInfo == null)
{
+ bpm.Value = "-";
+
length.Value = string.Empty;
circleCount.Value = string.Empty;
sliderCount.Value = string.Empty;
}
else
{
- length.TooltipText = BeatmapsetsStrings.ShowStatsTotalLength(TimeSpan.FromMilliseconds(beatmapInfo.Length).ToFormattedDuration());
+ bpm.Value = beatmapInfo.BPM.ToLocalisableString(@"0.##");
+
length.Value = TimeSpan.FromMilliseconds(beatmapInfo.Length).ToFormattedDuration();
- var onlineInfo = beatmapInfo as IBeatmapOnlineInfo;
+ if (beatmapInfo is not IBeatmapOnlineInfo onlineInfo) return;
- circleCount.Value = (onlineInfo?.CircleCount ?? 0).ToLocalisableString(@"N0");
- sliderCount.Value = (onlineInfo?.SliderCount ?? 0).ToLocalisableString(@"N0");
+ circleCount.Value = onlineInfo.CircleCount.ToLocalisableString(@"N0");
+ sliderCount.Value = onlineInfo.SliderCount.ToLocalisableString(@"N0");
+ length.TooltipText = BeatmapsetsStrings.ShowStatsTotalLength(TimeSpan.FromMilliseconds(onlineInfo.HitLength).ToFormattedDuration());
}
}
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index 6d89313979..b53b7826f3 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -47,9 +47,6 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
[Resolved]
private RulesetStore rulesets { get; set; }
- [Resolved]
- private ScoreManager scoreManager { get; set; }
-
private GetScoresRequest getScoresRequest;
private CancellationTokenSource loadCancellationSource;
@@ -85,7 +82,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
MD5Hash = apiBeatmap.MD5Hash
};
- var scores = scoreManager.OrderByTotalScore(value.Scores.Select(s => s.ToScoreInfo(rulesets, beatmapInfo))).ToArray();
+ var scores = value.Scores.Select(s => s.ToScoreInfo(rulesets, beatmapInfo)).OrderByTotalScore().ToArray();
var topScore = scores.First();
scoreTable.DisplayScores(scores, apiBeatmap.Status.GrantsPerformancePoints());
diff --git a/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs b/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
index 57b6f6268c..21b6147113 100644
--- a/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
+++ b/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Overlays.Chat.ChannelList
new Drawable?[]
{
createIcon(),
- text = new OsuSpriteText
+ text = new TruncatingSpriteText
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
@@ -94,7 +94,6 @@ namespace osu.Game.Overlays.Chat.ChannelList
Colour = colourProvider.Light3,
Margin = new MarginPadding { Bottom = 2 },
RelativeSizeAxes = Axes.X,
- Truncate = true,
},
createMentionPill(),
close = createCloseButton(),
diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index 2f4c175ac4..c85206d5f7 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -56,11 +56,11 @@ namespace osu.Game.Overlays.Chat
[Resolved]
private OverlayColourProvider? colourProvider { get; set; }
- private readonly OsuSpriteText drawableTimestamp;
+ private OsuSpriteText drawableTimestamp = null!;
- private readonly DrawableChatUsername drawableUsername;
+ private DrawableChatUsername drawableUsername = null!;
- private readonly LinkFlowContainer drawableContentFlow;
+ private LinkFlowContainer drawableContentFlow = null!;
private readonly Bindable prefer24HourTime = new Bindable();
@@ -69,8 +69,16 @@ namespace osu.Game.Overlays.Chat
public ChatLine(Message message)
{
Message = message;
+
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
+ }
+
+ [BackgroundDependencyLoader]
+ private void load(OsuConfigManager configManager)
+ {
+ configManager.BindWith(OsuSetting.Prefer24HourTime, prefer24HourTime);
+ prefer24HourTime.BindValueChanged(_ => updateTimestamp());
InternalChild = new GridContainer
{
@@ -103,7 +111,6 @@ namespace osu.Game.Overlays.Chat
Origin = Anchor.TopRight,
Anchor = Anchor.TopRight,
Margin = new MarginPadding { Horizontal = Spacing },
- ReportRequested = this.ShowPopover,
},
drawableContentFlow = new LinkFlowContainer(styleMessageContent)
{
@@ -115,13 +122,6 @@ namespace osu.Game.Overlays.Chat
};
}
- [BackgroundDependencyLoader]
- private void load(OsuConfigManager configManager)
- {
- configManager.BindWith(OsuSetting.Prefer24HourTime, prefer24HourTime);
- prefer24HourTime.BindValueChanged(_ => updateTimestamp());
- }
-
protected override void LoadComplete()
{
base.LoadComplete();
@@ -130,6 +130,17 @@ namespace osu.Game.Overlays.Chat
updateMessageContent();
FinishTransforms(true);
+
+ if (this.FindClosestParent() != null)
+ {
+ // This guards against cases like in-game chat where there's no available popover container.
+ // There may be a future where a global one becomes available, at which point this code may be unnecessary.
+ //
+ // See:
+ // https://github.com/ppy/osu/pull/23698
+ // https://github.com/ppy/osu/pull/14554
+ drawableUsername.ReportRequested = this.ShowPopover;
+ }
}
public Popover GetPopover() => new ReportChatPopover(message);
diff --git a/osu.Game/Overlays/Chat/ChatTextBar.cs b/osu.Game/Overlays/Chat/ChatTextBar.cs
index fd5e0e9836..87e787fcb8 100644
--- a/osu.Game/Overlays/Chat/ChatTextBar.cs
+++ b/osu.Game/Overlays/Chat/ChatTextBar.cs
@@ -73,14 +73,13 @@ namespace osu.Game.Overlays.Chat
Width = chatting_text_width,
Masking = true,
Padding = new MarginPadding { Horizontal = padding },
- Child = chattingText = new OsuSpriteText
+ Child = chattingText = new TruncatingSpriteText
{
MaxWidth = chatting_text_width - padding * 2,
Font = OsuFont.Torus.With(size: 20),
Colour = colourProvider.Background1,
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
- Truncate = true,
},
},
searchIconContainer = new Container
diff --git a/osu.Game/Overlays/Chat/DrawableChatUsername.cs b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
index 4b4afc204c..18632aa4af 100644
--- a/osu.Game/Overlays/Chat/DrawableChatUsername.cs
+++ b/osu.Game/Overlays/Chat/DrawableChatUsername.cs
@@ -83,11 +83,9 @@ namespace osu.Game.Overlays.Chat
Action = openUserProfile;
- drawableText = new OsuSpriteText
+ drawableText = new TruncatingSpriteText
{
Shadow = false,
- Truncate = true,
- EllipsisString = "…",
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
};
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 96dbfe31f3..87df08ceec 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -276,8 +276,6 @@ namespace osu.Game.Overlays
protected override void PopIn()
{
- base.PopIn();
-
this.MoveToY(0, transition_length, Easing.OutQuint);
this.FadeIn(transition_length, Easing.OutQuint);
}
diff --git a/osu.Game/Overlays/Dashboard/Home/DashboardBeatmapPanel.cs b/osu.Game/Overlays/Dashboard/Home/DashboardBeatmapPanel.cs
index 792d6cc785..f36e6b49bb 100644
--- a/osu.Game/Overlays/Dashboard/Home/DashboardBeatmapPanel.cs
+++ b/osu.Game/Overlays/Dashboard/Home/DashboardBeatmapPanel.cs
@@ -100,17 +100,15 @@ namespace osu.Game.Overlays.Dashboard.Home
Direction = FillDirection.Vertical,
Children = new Drawable[]
{
- new OsuSpriteText
+ new TruncatingSpriteText
{
RelativeSizeAxes = Axes.X,
- Truncate = true,
Font = OsuFont.GetFont(weight: FontWeight.Regular),
Text = BeatmapSet.Title
},
- new OsuSpriteText
+ new TruncatingSpriteText
{
RelativeSizeAxes = Axes.X,
- Truncate = true,
Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular),
Text = BeatmapSet.Artist
},
diff --git a/osu.Game/Overlays/DialogOverlay.cs b/osu.Game/Overlays/DialogOverlay.cs
index 098a5d0a33..005162bbcc 100644
--- a/osu.Game/Overlays/DialogOverlay.cs
+++ b/osu.Game/Overlays/DialogOverlay.cs
@@ -99,7 +99,6 @@ namespace osu.Game.Overlays
protected override void PopIn()
{
- base.PopIn();
lowPassFilter.CutoffTo(300, 100, Easing.OutCubic);
}
diff --git a/osu.Game/Overlays/FirstRunSetup/ScreenWelcome.cs b/osu.Game/Overlays/FirstRunSetup/ScreenWelcome.cs
index b8d802ad4b..68c6c78986 100644
--- a/osu.Game/Overlays/FirstRunSetup/ScreenWelcome.cs
+++ b/osu.Game/Overlays/FirstRunSetup/ScreenWelcome.cs
@@ -13,7 +13,6 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events;
using osu.Framework.Localisation;
using osu.Framework.Threading;
-using osu.Game.Extensions;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
@@ -68,13 +67,12 @@ namespace osu.Game.Overlays.FirstRunSetup
private partial class LanguageSelectionFlow : FillFlowContainer
{
- private Bindable frameworkLocale = null!;
- private IBindable localisationParameters = null!;
+ private Bindable language = null!;
private ScheduledDelegate? updateSelectedDelegate;
[BackgroundDependencyLoader]
- private void load(FrameworkConfigManager frameworkConfig, LocalisationManager localisation)
+ private void load(OsuGameBase game)
{
Direction = FillDirection.Full;
Spacing = new Vector2(5);
@@ -82,25 +80,18 @@ namespace osu.Game.Overlays.FirstRunSetup
ChildrenEnumerable = Enum.GetValues()
.Select(l => new LanguageButton(l)
{
- Action = () => frameworkLocale.Value = l.ToCultureCode()
+ Action = () => language.Value = l,
});
- frameworkLocale = frameworkConfig.GetBindable(FrameworkSetting.Locale);
- frameworkLocale.BindValueChanged(_ => onLanguageChange());
-
- localisationParameters = localisation.CurrentParameters.GetBoundCopy();
- localisationParameters.BindValueChanged(_ => onLanguageChange(), true);
- }
-
- private void onLanguageChange()
- {
- var language = LanguageExtensions.GetLanguageFor(frameworkLocale.Value, localisationParameters.Value);
-
- // Changing language may cause a short period of blocking the UI thread while the new glyphs are loaded.
- // Scheduling ensures the button animation plays smoothly after any blocking operation completes.
- // Note that a delay is required (the alternative would be a double-schedule; delay feels better).
- updateSelectedDelegate?.Cancel();
- updateSelectedDelegate = Scheduler.AddDelayed(() => updateSelectedStates(language), 50);
+ language = game.CurrentLanguage.GetBoundCopy();
+ language.BindValueChanged(v =>
+ {
+ // Changing language may cause a short period of blocking the UI thread while the new glyphs are loaded.
+ // Scheduling ensures the button animation plays smoothly after any blocking operation completes.
+ // Note that a delay is required (the alternative would be a double-schedule; delay feels better).
+ updateSelectedDelegate?.Cancel();
+ updateSelectedDelegate = Scheduler.AddDelayed(() => updateSelectedStates(v.NewValue), 50);
+ }, true);
}
private void updateSelectedStates(Language language)
diff --git a/osu.Game/Overlays/Login/LoginForm.cs b/osu.Game/Overlays/Login/LoginForm.cs
index af145c418c..9f9b8d9342 100644
--- a/osu.Game/Overlays/Login/LoginForm.cs
+++ b/osu.Game/Overlays/Login/LoginForm.cs
@@ -16,6 +16,7 @@ using osu.Game.Online.API;
using osu.Game.Overlays.Settings;
using osu.Game.Resources.Localisation.Web;
using osuTK;
+using osu.Game.Localisation;
namespace osu.Game.Overlays.Login
{
@@ -47,7 +48,7 @@ namespace osu.Game.Overlays.Login
RelativeSizeAxes = Axes.X;
ErrorTextFlowContainer errorText;
- LinkFlowContainer forgottenPaswordLink;
+ LinkFlowContainer forgottenPasswordLink;
Children = new Drawable[]
{
@@ -71,15 +72,15 @@ namespace osu.Game.Overlays.Login
},
new SettingsCheckbox
{
- LabelText = "Remember username",
+ LabelText = LoginPanelStrings.RememberUsername,
Current = config.GetBindable(OsuSetting.SaveUsername),
},
new SettingsCheckbox
{
- LabelText = "Stay signed in",
+ LabelText = LoginPanelStrings.StaySignedIn,
Current = config.GetBindable(OsuSetting.SavePassword),
},
- forgottenPaswordLink = new LinkFlowContainer
+ forgottenPasswordLink = new LinkFlowContainer
{
Padding = new MarginPadding { Left = SettingsPanel.CONTENT_MARGINS },
RelativeSizeAxes = Axes.X,
@@ -105,7 +106,7 @@ namespace osu.Game.Overlays.Login
},
new SettingsButton
{
- Text = "Register",
+ Text = LoginPanelStrings.Register,
Action = () =>
{
RequestHide?.Invoke();
@@ -114,7 +115,7 @@ namespace osu.Game.Overlays.Login
}
};
- forgottenPaswordLink.AddLink(LayoutStrings.PopupLoginLoginForgot, $"{api.WebsiteRootUrl}/home/password-reset");
+ forgottenPasswordLink.AddLink(LayoutStrings.PopupLoginLoginForgot, $"{api.WebsiteRootUrl}/home/password-reset");
password.OnCommit += (_, _) => performLogin();
diff --git a/osu.Game/Overlays/Login/LoginPanel.cs b/osu.Game/Overlays/Login/LoginPanel.cs
index 44f2f3273a..79569ada65 100644
--- a/osu.Game/Overlays/Login/LoginPanel.cs
+++ b/osu.Game/Overlays/Login/LoginPanel.cs
@@ -6,6 +6,7 @@
using System;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
+using osu.Framework.Extensions.LocalisationExtensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Input.Events;
@@ -81,7 +82,7 @@ namespace osu.Game.Overlays.Login
{
new OsuSpriteText
{
- Text = "ACCOUNT",
+ Text = LoginPanelStrings.Account.ToUpper(),
Margin = new MarginPadding { Bottom = 5 },
Font = OsuFont.GetFont(weight: FontWeight.Bold),
},
@@ -115,7 +116,7 @@ namespace osu.Game.Overlays.Login
},
};
- linkFlow.AddLink("cancel", api.Logout, string.Empty);
+ linkFlow.AddLink(Resources.Localisation.Web.CommonStrings.ButtonsCancel.ToLower(), api.Logout, string.Empty);
break;
case APIState.Online:
@@ -140,7 +141,7 @@ namespace osu.Game.Overlays.Login
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
- Text = "Signed in",
+ Text = LoginPanelStrings.SignedIn,
Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold),
Margin = new MarginPadding { Top = 5, Bottom = 5 },
},
diff --git a/osu.Game/Overlays/Login/UserAction.cs b/osu.Game/Overlays/Login/UserAction.cs
index 7a18e38109..d4d639f2fb 100644
--- a/osu.Game/Overlays/Login/UserAction.cs
+++ b/osu.Game/Overlays/Login/UserAction.cs
@@ -1,11 +1,9 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
-using System.ComponentModel;
using osu.Framework.Localisation;
using osu.Game.Resources.Localisation.Web;
+using osu.Game.Localisation;
namespace osu.Game.Overlays.Login
{
@@ -14,13 +12,13 @@ namespace osu.Game.Overlays.Login
[LocalisableDescription(typeof(UsersStrings), nameof(UsersStrings.StatusOnline))]
Online,
- [Description(@"Do not disturb")]
+ [LocalisableDescription(typeof(LoginPanelStrings), nameof(LoginPanelStrings.DoNotDisturb))]
DoNotDisturb,
- [Description(@"Appear offline")]
+ [LocalisableDescription(typeof(LoginPanelStrings), nameof(LoginPanelStrings.AppearOffline))]
AppearOffline,
- [Description(@"Sign out")]
+ [LocalisableDescription(typeof(UserVerificationStrings), nameof(UserVerificationStrings.BoxInfoLogoutLink))]
SignOut,
}
}
diff --git a/osu.Game/Overlays/LoginOverlay.cs b/osu.Game/Overlays/LoginOverlay.cs
index 536811dfcf..8b60024682 100644
--- a/osu.Game/Overlays/LoginOverlay.cs
+++ b/osu.Game/Overlays/LoginOverlay.cs
@@ -75,8 +75,6 @@ namespace osu.Game.Overlays
protected override void PopIn()
{
- base.PopIn();
-
panel.Bounding = true;
this.FadeIn(transition_time, Easing.OutQuint);
diff --git a/osu.Game/Overlays/MedalOverlay.cs b/osu.Game/Overlays/MedalOverlay.cs
index bd895fe6bf..eba35ec6f9 100644
--- a/osu.Game/Overlays/MedalOverlay.cs
+++ b/osu.Game/Overlays/MedalOverlay.cs
@@ -246,9 +246,13 @@ namespace osu.Game.Overlays
}
}
+ protected override void PopIn()
+ {
+ this.FadeIn(200);
+ }
+
protected override void PopOut()
{
- base.PopOut();
this.FadeOut(200);
}
diff --git a/osu.Game/Overlays/Mods/DeselectAllModsButton.cs b/osu.Game/Overlays/Mods/DeselectAllModsButton.cs
index 3e5a3b12d1..817b6beac3 100644
--- a/osu.Game/Overlays/Mods/DeselectAllModsButton.cs
+++ b/osu.Game/Overlays/Mods/DeselectAllModsButton.cs
@@ -6,16 +6,13 @@
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Bindables;
-using osu.Framework.Input.Bindings;
-using osu.Framework.Input.Events;
using osu.Game.Graphics.UserInterface;
-using osu.Game.Input.Bindings;
using osu.Game.Localisation;
using osu.Game.Rulesets.Mods;
namespace osu.Game.Overlays.Mods
{
- public partial class DeselectAllModsButton : ShearedButton, IKeyBindingHandler
+ public partial class DeselectAllModsButton : ShearedButton
{
private readonly Bindable> selectedMods = new Bindable>();
@@ -39,18 +36,5 @@ namespace osu.Game.Overlays.Mods
{
Enabled.Value = selectedMods.Value.Any();
}
-
- public bool OnPressed(KeyBindingPressEvent e)
- {
- if (e.Repeat || e.Action != GlobalAction.DeselectAllMods)
- return false;
-
- TriggerClick();
- return true;
- }
-
- public void OnReleased(KeyBindingReleaseEvent e)
- {
- }
}
}
diff --git a/osu.Game/Overlays/Mods/Input/ClassicModHotkeyHandler.cs b/osu.Game/Overlays/Mods/Input/ClassicModHotkeyHandler.cs
index 4f3c18fc43..59a631a7b5 100644
--- a/osu.Game/Overlays/Mods/Input/ClassicModHotkeyHandler.cs
+++ b/osu.Game/Overlays/Mods/Input/ClassicModHotkeyHandler.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Overlays.Mods.Input
if (!mod_type_lookup.TryGetValue(e.Key, out var typesToMatch))
return false;
- var matchingMods = availableMods.Where(modState => matches(modState, typesToMatch) && !modState.Filtered.Value).ToArray();
+ var matchingMods = availableMods.Where(modState => matches(modState, typesToMatch) && modState.Visible).ToArray();
if (matchingMods.Length == 0)
return false;
diff --git a/osu.Game/Overlays/Mods/Input/SequentialModHotkeyHandler.cs b/osu.Game/Overlays/Mods/Input/SequentialModHotkeyHandler.cs
index dedb556304..e638063438 100644
--- a/osu.Game/Overlays/Mods/Input/SequentialModHotkeyHandler.cs
+++ b/osu.Game/Overlays/Mods/Input/SequentialModHotkeyHandler.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Overlays.Mods.Input
if (index < 0)
return false;
- var modState = availableMods.Where(modState => !modState.Filtered.Value).ElementAtOrDefault(index);
+ var modState = availableMods.Where(modState => modState.Visible).ElementAtOrDefault(index);
if (modState == null)
return false;
diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index 5d9f616e5f..d65c94d14d 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -46,7 +46,8 @@ namespace osu.Game.Overlays.Mods
foreach (var mod in availableMods)
{
mod.Active.BindValueChanged(_ => updateState());
- mod.Filtered.BindValueChanged(_ => updateState());
+ mod.MatchingTextFilter.BindValueChanged(_ => updateState());
+ mod.ValidForSelection.BindValueChanged(_ => updateState());
}
updateState();
@@ -145,12 +146,17 @@ namespace osu.Game.Overlays.Mods
private void updateState()
{
- Alpha = availableMods.All(mod => mod.Filtered.Value) ? 0 : 1;
+ Alpha = availableMods.All(mod => !mod.Visible) ? 0 : 1;
if (toggleAllCheckbox != null && !SelectionAnimationRunning)
{
- toggleAllCheckbox.Alpha = availableMods.Any(panel => !panel.Filtered.Value) ? 1 : 0;
- toggleAllCheckbox.Current.Value = availableMods.Where(panel => !panel.Filtered.Value).All(panel => panel.Active.Value);
+ bool anyPanelsVisible = availableMods.Any(panel => panel.Visible);
+
+ toggleAllCheckbox.Alpha = anyPanelsVisible ? 1 : 0;
+
+ // checking `anyPanelsVisible` is important since `.All()` returns `true` for empty enumerables.
+ if (anyPanelsVisible)
+ toggleAllCheckbox.Current.Value = availableMods.Where(panel => panel.Visible).All(panel => panel.Active.Value);
}
}
@@ -176,7 +182,7 @@ namespace osu.Game.Overlays.Mods
dequeuedAction();
// each time we play an animation, we decrease the time until the next animation (to ramp the visual and audible elements).
- selectionDelay = Math.Max(30, selectionDelay * 0.8f);
+ selectionDelay = Math.Max(ModSelectPanel.SAMPLE_PLAYBACK_DELAY, selectionDelay * 0.8f);
lastSelection = Time.Current;
}
else
@@ -195,7 +201,7 @@ namespace osu.Game.Overlays.Mods
{
pendingSelectionOperations.Clear();
- foreach (var button in availableMods.Where(b => !b.Active.Value && !b.Filtered.Value))
+ foreach (var button in availableMods.Where(b => !b.Active.Value && b.Visible))
pendingSelectionOperations.Enqueue(() => button.Active.Value = true);
}
@@ -206,8 +212,13 @@ namespace osu.Game.Overlays.Mods
{
pendingSelectionOperations.Clear();
- foreach (var button in availableMods.Where(b => b.Active.Value && !b.Filtered.Value))
- pendingSelectionOperations.Enqueue(() => button.Active.Value = false);
+ foreach (var button in availableMods.Where(b => b.Active.Value))
+ {
+ if (!button.Visible)
+ button.Active.Value = false;
+ else
+ pendingSelectionOperations.Enqueue(() => button.Active.Value = false);
+ }
}
///
diff --git a/osu.Game/Overlays/Mods/ModPanel.cs b/osu.Game/Overlays/Mods/ModPanel.cs
index b5fee9d116..f294b1892d 100644
--- a/osu.Game/Overlays/Mods/ModPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPanel.cs
@@ -1,9 +1,12 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
+using System.Collections.Generic;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Localisation;
using osu.Game.Graphics;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.UI;
@@ -11,11 +14,10 @@ using osuTK;
namespace osu.Game.Overlays.Mods
{
- public partial class ModPanel : ModSelectPanel
+ public partial class ModPanel : ModSelectPanel, IFilterable
{
public Mod Mod => modState.Mod;
public override BindableBool Active => modState.Active;
- public BindableBool Filtered => modState.Filtered;
protected override float IdleSwitchWidth => 54;
protected override float ExpandedSwitchWidth => 70;
@@ -54,7 +56,8 @@ namespace osu.Game.Overlays.Mods
{
base.LoadComplete();
- Filtered.BindValueChanged(_ => updateFilterState(), true);
+ modState.ValidForSelection.BindValueChanged(_ => updateFilterState());
+ modState.MatchingTextFilter.BindValueChanged(_ => updateFilterState(), true);
}
protected override void Select()
@@ -71,9 +74,25 @@ namespace osu.Game.Overlays.Mods
#region Filtering support
+ ///
+ public bool Visible => modState.Visible;
+
+ public override IEnumerable FilterTerms => new[]
+ {
+ Mod.Name,
+ Mod.Acronym,
+ Mod.Description
+ };
+
+ public override bool MatchingFilter
+ {
+ get => modState.MatchingTextFilter.Value;
+ set => modState.MatchingTextFilter.Value = value;
+ }
+
private void updateFilterState()
{
- this.FadeTo(Filtered.Value ? 0 : 1);
+ this.FadeTo(Visible ? 1 : 0);
}
#endregion
diff --git a/osu.Game/Overlays/Mods/ModPresetPanel.cs b/osu.Game/Overlays/Mods/ModPresetPanel.cs
index 8bcb5e4e4e..00f6e36972 100644
--- a/osu.Game/Overlays/Mods/ModPresetPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPresetPanel.cs
@@ -9,6 +9,7 @@ using osu.Framework.Bindables;
using osu.Framework.Extensions;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Localisation;
using osu.Game.Configuration;
using osu.Game.Database;
using osu.Game.Graphics;
@@ -81,6 +82,27 @@ namespace osu.Game.Overlays.Mods
Active.Value = new HashSet(Preset.Value.Mods).SetEquals(selectedMods.Value);
}
+ #region Filtering support
+
+ public override IEnumerable FilterTerms => getFilterTerms();
+
+ private IEnumerable getFilterTerms()
+ {
+ var preset = Preset.Value;
+
+ yield return preset.Name;
+ yield return preset.Description;
+
+ foreach (Mod mod in preset.Mods)
+ {
+ yield return mod.Name;
+ yield return mod.Acronym;
+ yield return mod.Description;
+ }
+ }
+
+ #endregion
+
#region IHasCustomTooltip
public ModPreset TooltipContent => Preset.Value;
diff --git a/osu.Game/Overlays/Mods/ModSearchContainer.cs b/osu.Game/Overlays/Mods/ModSearchContainer.cs
new file mode 100644
index 0000000000..8787530d5c
--- /dev/null
+++ b/osu.Game/Overlays/Mods/ModSearchContainer.cs
@@ -0,0 +1,27 @@
+// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Overlays.Mods
+{
+ public partial class ModSearchContainer : SearchContainer
+ {
+ public new string SearchTerm
+ {
+ get => base.SearchTerm;
+ set
+ {
+ if (value == SearchTerm)
+ return;
+
+ base.SearchTerm = value;
+
+ // Manual filtering here is required because ModColumn can be hidden when search term applied,
+ // causing the whole SearchContainer to become non-present and never actually perform a subsequent
+ // filter.
+ Filter();
+ }
+ }
+ }
+}
diff --git a/osu.Game/Overlays/Mods/ModSelectColumn.cs b/osu.Game/Overlays/Mods/ModSelectColumn.cs
index e6d7bcd97d..338ebdaef4 100644
--- a/osu.Game/Overlays/Mods/ModSelectColumn.cs
+++ b/osu.Game/Overlays/Mods/ModSelectColumn.cs
@@ -43,10 +43,15 @@ namespace osu.Game.Overlays.Mods
///
public readonly Bindable Active = new BindableBool(true);
+ public string SearchTerm
+ {
+ set => ItemsFlow.SearchTerm = value;
+ }
+
protected override bool ReceivePositionalInputAtSubTree(Vector2 screenSpacePos) => base.ReceivePositionalInputAtSubTree(screenSpacePos) && Active.Value;
protected readonly Container ControlContainer;
- protected readonly FillFlowContainer ItemsFlow;
+ protected readonly ModSearchContainer ItemsFlow;
private readonly TextFlowContainer headerText;
private readonly Box headerBackground;
@@ -150,7 +155,7 @@ namespace osu.Game.Overlays.Mods
RelativeSizeAxes = Axes.Both,
ClampExtension = 100,
ScrollbarOverlapsContent = false,
- Child = ItemsFlow = new FillFlowContainer
+ Child = ItemsFlow = new ModSearchContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 38ae8c68cb..9035503723 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -12,6 +12,8 @@ using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor;
+using osu.Framework.Input;
+using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
using osu.Framework.Utils;
using osu.Game.Audio;
@@ -25,10 +27,11 @@ using osu.Game.Localisation;
using osu.Game.Rulesets.Mods;
using osu.Game.Utils;
using osuTK;
+using osuTK.Input;
namespace osu.Game.Overlays.Mods
{
- public abstract partial class ModSelectOverlay : ShearedOverlayContainer, ISamplePlaybackDisabler
+ public abstract partial class ModSelectOverlay : ShearedOverlayContainer, ISamplePlaybackDisabler, IKeyBindingHandler
{
public const int BUTTON_WIDTH = 200;
@@ -64,6 +67,14 @@ namespace osu.Game.Overlays.Mods
}
}
+ public string SearchTerm
+ {
+ get => SearchTextBox.Current.Value;
+ set => SearchTextBox.Current.Value = value;
+ }
+
+ public ShearedSearchTextBox SearchTextBox { get; private set; } = null!;
+
///
/// Whether the total score multiplier calculated from the current selected set of mods should be shown.
///
@@ -94,7 +105,7 @@ namespace osu.Game.Overlays.Mods
};
}
- yield return new DeselectAllModsButton(this);
+ yield return deselectAllModsButton = new DeselectAllModsButton(this);
}
private readonly Bindable>> globalAvailableMods = new Bindable>>();
@@ -107,11 +118,14 @@ namespace osu.Game.Overlays.Mods
private ColumnScrollContainer columnScroll = null!;
private ColumnFlowContainer columnFlow = null!;
private FillFlowContainer footerButtonFlow = null!;
+ private DeselectAllModsButton deselectAllModsButton = null!;
+ private Container aboveColumnsContent = null!;
private DifficultyMultiplierDisplay? multiplierDisplay;
protected ShearedButton BackButton { get; private set; } = null!;
protected ShearedToggleButton? CustomisationButton { get; private set; }
+ protected SelectAllModsButton? SelectAllModsButton { get; set; }
private Sample? columnAppearSample;
@@ -146,6 +160,17 @@ namespace osu.Game.Overlays.Mods
MainAreaContent.AddRange(new Drawable[]
{
+ aboveColumnsContent = new Container
+ {
+ RelativeSizeAxes = Axes.X,
+ Height = ModsEffectDisplay.HEIGHT,
+ Padding = new MarginPadding { Horizontal = 100 },
+ Child = SearchTextBox = new ShearedSearchTextBox
+ {
+ HoldFocus = false,
+ Width = 300
+ }
+ },
new OsuContextMenuContainer
{
RelativeSizeAxes = Axes.Both,
@@ -153,7 +178,7 @@ namespace osu.Game.Overlays.Mods
{
Padding = new MarginPadding
{
- Top = (ShowTotalMultiplier ? ModsEffectDisplay.HEIGHT : 0) + PADDING,
+ Top = ModsEffectDisplay.HEIGHT + PADDING,
Bottom = PADDING
},
RelativeSizeAxes = Axes.Both,
@@ -186,18 +211,10 @@ namespace osu.Game.Overlays.Mods
if (ShowTotalMultiplier)
{
- MainAreaContent.Add(new Container
+ aboveColumnsContent.Add(multiplierDisplay = new DifficultyMultiplierDisplay
{
Anchor = Anchor.TopRight,
- Origin = Anchor.TopRight,
- AutoSizeAxes = Axes.X,
- Height = ModsEffectDisplay.HEIGHT,
- Margin = new MarginPadding { Horizontal = 100 },
- Child = multiplierDisplay = new DifficultyMultiplierDisplay
- {
- Anchor = Anchor.Centre,
- Origin = Anchor.Centre
- },
+ Origin = Anchor.TopRight
});
}
@@ -226,6 +243,14 @@ namespace osu.Game.Overlays.Mods
globalAvailableMods.BindTo(game.AvailableMods);
}
+ public override void Hide()
+ {
+ base.Hide();
+
+ // clear search for next user interaction with mod overlay
+ SearchTextBox.Current.Value = string.Empty;
+ }
+
private ModSettingChangeTracker? modSettingChangeTracker;
protected override void LoadComplete()
@@ -263,6 +288,12 @@ namespace osu.Game.Overlays.Mods
customisationVisible.BindValueChanged(_ => updateCustomisationVisualState(), true);
+ SearchTextBox.Current.BindValueChanged(query =>
+ {
+ foreach (var column in columnFlow.Columns)
+ column.SearchTerm = query.NewValue;
+ }, true);
+
// Start scrolled slightly to the right to give the user a sense that
// there is more horizontal content available.
ScheduleAfterChildren(() =>
@@ -272,6 +303,13 @@ namespace osu.Game.Overlays.Mods
});
}
+ protected override void Update()
+ {
+ base.Update();
+
+ SearchTextBox.PlaceholderText = SearchTextBox.HasFocus ? Resources.Localisation.Web.CommonStrings.InputSearch : ModSelectOverlayStrings.TabToSearch;
+ }
+
///
/// Select all visible mods in all columns.
///
@@ -344,7 +382,7 @@ namespace osu.Game.Overlays.Mods
private void filterMods()
{
foreach (var modState in allAvailableMods)
- modState.Filtered.Value = !modState.Mod.HasImplementation || !IsValidMod.Invoke(modState.Mod);
+ modState.ValidForSelection.Value = modState.Mod.HasImplementation && IsValidMod.Invoke(modState.Mod);
}
private void updateMultiplier()
@@ -469,7 +507,7 @@ namespace osu.Game.Overlays.Mods
base.PopIn();
- multiplierDisplay?
+ aboveColumnsContent
.FadeIn(fade_in_duration, Easing.OutQuint)
.MoveToY(0, fade_in_duration, Easing.OutQuint);
@@ -479,7 +517,7 @@ namespace osu.Game.Overlays.Mods
{
var column = columnFlow[i].Column;
- bool allFiltered = column is ModColumn modColumn && modColumn.AvailableMods.All(modState => modState.Filtered.Value);
+ bool allFiltered = column is ModColumn modColumn && modColumn.AvailableMods.All(modState => !modState.Visible);
double delay = allFiltered ? 0 : nonFilteredColumnCount * 30;
double duration = allFiltered ? 0 : fade_in_duration;
@@ -527,7 +565,7 @@ namespace osu.Game.Overlays.Mods
base.PopOut();
- multiplierDisplay?
+ aboveColumnsContent
.FadeOut(fade_out_duration / 2, Easing.OutQuint)
.MoveToY(-distance, fade_out_duration / 2, Easing.OutQuint);
@@ -541,7 +579,7 @@ namespace osu.Game.Overlays.Mods
if (column is ModColumn modColumn)
{
- allFiltered = modColumn.AvailableMods.All(modState => modState.Filtered.Value);
+ allFiltered = modColumn.AvailableMods.All(modState => !modState.Visible);
modColumn.FlushPendingSelections();
}
@@ -578,10 +616,38 @@ namespace osu.Game.Overlays.Mods
// This is handled locally here because this overlay is being registered at the game level
// and therefore takes away keyboard focus from the screen stack.
case GlobalAction.ToggleModSelection:
+ // Pressing toggle should completely hide the overlay in one shot.
+ hideOverlay(true);
+ return true;
+
+ // This is handled locally here due to conflicts in input handling between the search text box and the deselect all mods button.
+ // Attempting to handle this action locally in both places leads to a possible scenario
+ // wherein activating the binding will both change the contents of the search text box and deselect all mods.
+ case GlobalAction.DeselectAllMods:
+ {
+ if (!SearchTextBox.HasFocus)
+ {
+ deselectAllModsButton.TriggerClick();
+ return true;
+ }
+
+ break;
+ }
+
case GlobalAction.Select:
{
- // Pressing toggle or select should completely hide the overlay in one shot.
- hideOverlay(true);
+ // Pressing select should select first filtered mod or completely hide the overlay in one shot if search term is empty.
+ if (string.IsNullOrEmpty(SearchTerm))
+ {
+ hideOverlay(true);
+ return true;
+ }
+
+ ModState? firstMod = columnFlow.Columns.OfType().FirstOrDefault(m => m.IsPresent)?.AvailableMods.FirstOrDefault(x => x.Visible);
+
+ if (firstMod is not null)
+ firstMod.Active.Value = !firstMod.Active.Value;
+
return true;
}
}
@@ -603,6 +669,39 @@ namespace osu.Game.Overlays.Mods
}
}
+ ///
+ ///
+ /// This is handled locally here due to conflicts in input handling between the search text box and the select all mods button.
+ /// Attempting to handle this action locally in both places leads to a possible scenario
+ /// wherein activating the "select all" platform binding will both select all text in the search box and select all mods.
+ /// >
+ public bool OnPressed(KeyBindingPressEvent e)
+ {
+ if (e.Repeat || e.Action != PlatformAction.SelectAll || SelectAllModsButton is null)
+ return false;
+
+ SelectAllModsButton.TriggerClick();
+ return true;
+ }
+
+ public void OnReleased(KeyBindingReleaseEvent e)
+ {
+ }
+
+ protected override bool OnKeyDown(KeyDownEvent e)
+ {
+ if (e.Repeat || e.Key != Key.Tab)
+ return false;
+
+ // TODO: should probably eventually support typical platform search shortcuts (`Ctrl-F`, `/`)
+ if (SearchTextBox.HasFocus)
+ SearchTextBox.KillFocus();
+ else
+ SearchTextBox.TakeFocus();
+
+ return true;
+ }
+
#endregion
#region Sample playback control
@@ -743,6 +842,9 @@ namespace osu.Game.Overlays.Mods
if (!Active.Value)
RequestScroll?.Invoke(this);
+ // Killing focus is done here because it's the only feasible place on ModSelectOverlay you can click on without triggering any action.
+ Scheduler.Add(() => GetContainingInputManager().ChangeFocus(null));
+
return true;
}
diff --git a/osu.Game/Overlays/Mods/ModSelectPanel.cs b/osu.Game/Overlays/Mods/ModSelectPanel.cs
index 81285833bd..29f4c93e88 100644
--- a/osu.Game/Overlays/Mods/ModSelectPanel.cs
+++ b/osu.Game/Overlays/Mods/ModSelectPanel.cs
@@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
+using System.Collections.Generic;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
@@ -14,6 +15,7 @@ using osu.Framework.Input.Events;
using osu.Framework.Localisation;
using osu.Framework.Utils;
using osu.Game.Audio;
+using osu.Game.Configuration;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
@@ -24,7 +26,7 @@ using osuTK.Input;
namespace osu.Game.Overlays.Mods
{
- public abstract partial class ModSelectPanel : OsuClickableContainer, IHasAccentColour
+ public abstract partial class ModSelectPanel : OsuClickableContainer, IHasAccentColour, IFilterable
{
public abstract BindableBool Active { get; }
@@ -45,6 +47,8 @@ namespace osu.Game.Overlays.Mods
public const float CORNER_RADIUS = 7;
public const float HEIGHT = 42;
+ public const double SAMPLE_PLAYBACK_DELAY = 30;
+
protected virtual float IdleSwitchWidth => 14;
protected virtual float ExpandedSwitchWidth => 30;
protected virtual Colour4 BackgroundColour => Active.Value ? AccentColour.Darken(0.3f) : ColourProvider.Background3;
@@ -69,6 +73,8 @@ namespace osu.Game.Overlays.Mods
private Sample? sampleOff;
private Sample? sampleOn;
+ private Bindable lastPlaybackTime = null!;
+
protected ModSelectPanel()
{
RelativeSizeAxes = Axes.X;
@@ -118,23 +124,23 @@ namespace osu.Game.Overlays.Mods
Direction = FillDirection.Vertical,
Children = new[]
{
- titleText = new OsuSpriteText
+ titleText = new TruncatingSpriteText
{
Font = OsuFont.TorusAlternate.With(size: 18, weight: FontWeight.SemiBold),
RelativeSizeAxes = Axes.X,
- Truncate = true,
Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
Margin = new MarginPadding
{
Left = -18 * ShearedOverlayContainer.SHEAR
- }
+ },
+ ShowTooltip = false, // Tooltip is handled by `IncompatibilityDisplayingModPanel`.
},
- descriptionText = new OsuSpriteText
+ descriptionText = new TruncatingSpriteText
{
Font = OsuFont.Default.With(size: 12),
RelativeSizeAxes = Axes.X,
- Truncate = true,
- Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0)
+ Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+ ShowTooltip = false, // Tooltip is handled by `IncompatibilityDisplayingModPanel`.
}
}
}
@@ -163,13 +169,15 @@ namespace osu.Game.Overlays.Mods
protected abstract void Deselect();
[BackgroundDependencyLoader]
- private void load(AudioManager audio, ISamplePlaybackDisabler? samplePlaybackDisabler)
+ private void load(AudioManager audio, SessionStatics statics, ISamplePlaybackDisabler? samplePlaybackDisabler)
{
sampleOn = audio.Samples.Get(@"UI/check-on");
sampleOff = audio.Samples.Get(@"UI/check-off");
if (samplePlaybackDisabler != null)
((IBindable)samplePlaybackDisabled).BindTo(samplePlaybackDisabler.SamplePlaybackDisabled);
+
+ lastPlaybackTime = statics.GetBindable(Static.LastHoverSoundPlaybackTime);
}
protected sealed override HoverSounds CreateHoverSounds(HoverSampleSet sampleSet) => new HoverSounds(sampleSet);
@@ -192,10 +200,20 @@ namespace osu.Game.Overlays.Mods
if (samplePlaybackDisabled.Value)
return;
- if (Active.Value)
- sampleOn?.Play();
- else
- sampleOff?.Play();
+ if (!IsPresent)
+ return;
+
+ bool enoughTimePassedSinceLastPlayback = !lastPlaybackTime.Value.HasValue || Time.Current - lastPlaybackTime.Value >= SAMPLE_PLAYBACK_DELAY;
+
+ if (enoughTimePassedSinceLastPlayback)
+ {
+ if (Active.Value)
+ sampleOn?.Play();
+ else
+ sampleOff?.Play();
+
+ lastPlaybackTime.Value = Time.Current;
+ }
}
protected override bool OnHover(HoverEvent e)
@@ -263,5 +281,28 @@ namespace osu.Game.Overlays.Mods
TextBackground.FadeColour(foregroundColour, transitionDuration, Easing.OutQuint);
TextFlow.FadeColour(textColour, transitionDuration, Easing.OutQuint);
}
+
+ #region IFilterable
+
+ public abstract IEnumerable FilterTerms { get; }
+
+ private bool matchingFilter = true;
+
+ public virtual bool MatchingFilter
+ {
+ get => matchingFilter;
+ set
+ {
+ if (matchingFilter == value)
+ return;
+
+ matchingFilter = value;
+ this.FadeTo(value ? 1 : 0);
+ }
+ }
+
+ public bool FilteringActive { set { } }
+
+ #endregion
}
}
diff --git a/osu.Game/Overlays/Mods/ModState.cs b/osu.Game/Overlays/Mods/ModState.cs
index 3ee890e876..7a5bc0f3ae 100644
--- a/osu.Game/Overlays/Mods/ModState.cs
+++ b/osu.Game/Overlays/Mods/ModState.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using osu.Framework.Bindables;
using osu.Game.Rulesets.Mods;
@@ -32,9 +30,21 @@ namespace osu.Game.Overlays.Mods
public bool PendingConfiguration { get; set; }
///
- /// Whether the mod is currently filtered out due to not matching imposed criteria.
+ /// Whether the mod is currently valid for selection.
+ /// This can be in scenarios such as the free mod select overlay, where not all mods are selectable
+ /// regardless of search criteria imposed by the user selecting.
///
- public BindableBool Filtered { get; } = new BindableBool();
+ public BindableBool ValidForSelection { get; } = new BindableBool(true);
+
+ ///
+ /// Whether the mod is matching the current textual filter.
+ ///
+ public BindableBool MatchingTextFilter { get; } = new BindableBool(true);
+
+ ///
+ /// Whether the matches all applicable filters and visible for the user to select.
+ ///
+ public bool Visible => MatchingTextFilter.Value && ValidForSelection.Value;
public ModState(Mod mod)
{
diff --git a/osu.Game/Overlays/Mods/SelectAllModsButton.cs b/osu.Game/Overlays/Mods/SelectAllModsButton.cs
index f4b8025227..bb61cdc35d 100644
--- a/osu.Game/Overlays/Mods/SelectAllModsButton.cs
+++ b/osu.Game/Overlays/Mods/SelectAllModsButton.cs
@@ -1,14 +1,9 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Bindables;
-using osu.Framework.Input;
-using osu.Framework.Input.Bindings;
-using osu.Framework.Input.Events;
using osu.Game.Graphics.UserInterface;
using osu.Game.Localisation;
using osu.Game.Rulesets.Mods;
@@ -16,10 +11,11 @@ using osu.Game.Screens.OnlinePlay;
namespace osu.Game.Overlays.Mods
{
- public partial class SelectAllModsButton : ShearedButton, IKeyBindingHandler
+ public partial class SelectAllModsButton : ShearedButton
{
private readonly Bindable> selectedMods = new Bindable>();
private readonly Bindable>> availableMods = new Bindable>>();
+ private readonly Bindable searchTerm = new Bindable();
public SelectAllModsButton(FreeModSelectOverlay modSelectOverlay)
: base(ModSelectOverlay.BUTTON_WIDTH)
@@ -29,6 +25,7 @@ namespace osu.Game.Overlays.Mods
selectedMods.BindTo(modSelectOverlay.SelectedMods);
availableMods.BindTo(modSelectOverlay.AvailableMods);
+ searchTerm.BindTo(modSelectOverlay.SearchTextBox.Current);
}
protected override void LoadComplete()
@@ -37,6 +34,7 @@ namespace osu.Game.Overlays.Mods
selectedMods.BindValueChanged(_ => Scheduler.AddOnce(updateEnabledState));
availableMods.BindValueChanged(_ => Scheduler.AddOnce(updateEnabledState));
+ searchTerm.BindValueChanged(_ => Scheduler.AddOnce(updateEnabledState));
updateEnabledState();
}
@@ -44,20 +42,7 @@ namespace osu.Game.Overlays.Mods
{
Enabled.Value = availableMods.Value
.SelectMany(pair => pair.Value)
- .Any(modState => !modState.Active.Value && !modState.Filtered.Value);
- }
-
- public bool OnPressed(KeyBindingPressEvent e)
- {
- if (e.Repeat || e.Action != PlatformAction.SelectAll)
- return false;
-
- TriggerClick();
- return true;
- }
-
- public void OnReleased(KeyBindingReleaseEvent e)
- {
+ .Any(modState => !modState.Active.Value && modState.Visible);
}
}
}
diff --git a/osu.Game/Overlays/Mods/ShearedOverlayContainer.cs b/osu.Game/Overlays/Mods/ShearedOverlayContainer.cs
index 7f7b09a62c..a372ec70db 100644
--- a/osu.Game/Overlays/Mods/ShearedOverlayContainer.cs
+++ b/osu.Game/Overlays/Mods/ShearedOverlayContainer.cs
@@ -130,7 +130,6 @@ namespace osu.Game.Overlays.Mods
{
const double fade_in_duration = 400;
- base.PopIn();
this.FadeIn(fade_in_duration, Easing.OutQuint);
Header.MoveToY(0, fade_in_duration, Easing.OutQuint);
diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index f2eefb6e4b..15e6c94b34 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -206,8 +206,6 @@ namespace osu.Game.Overlays
protected override void PopIn()
{
- base.PopIn();
-
this.MoveToX(0, TRANSITION_LENGTH, Easing.OutQuint);
mainContent.FadeTo(1, TRANSITION_LENGTH, Easing.OutQuint);
mainContent.FadeEdgeEffectTo(WaveContainer.SHADOW_OPACITY, WaveContainer.APPEAR_DURATION, Easing.Out);
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 66fb3571ba..15eefb2d9f 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -229,8 +229,6 @@ namespace osu.Game.Overlays
protected override void PopIn()
{
- base.PopIn();
-
this.FadeIn(transition_length, Easing.OutQuint);
dragContainer.ScaleTo(1, transition_length, Easing.OutElastic);
}
@@ -415,7 +413,7 @@ namespace osu.Game.Overlays
[BackgroundDependencyLoader]
private void load(LargeTextureStore textures)
{
- sprite.Texture = beatmap?.Background ?? textures.Get(@"Backgrounds/bg4");
+ sprite.Texture = beatmap?.GetBackground() ?? textures.Get(@"Backgrounds/bg4");
}
}
diff --git a/osu.Game/Overlays/OverlayActivation.cs b/osu.Game/Overlays/OverlayActivation.cs
index 354153734e..68d7ee8ea9 100644
--- a/osu.Game/Overlays/OverlayActivation.cs
+++ b/osu.Game/Overlays/OverlayActivation.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
namespace osu.Game.Overlays
{
public enum OverlayActivation
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
index 1755c12f94..fc354027c1 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
{
protected override LocalisableString Header => AudioSettingsStrings.OffsetHeader;
- public override IEnumerable FilterTerms => base.FilterTerms.Concat(new LocalisableString[] { "universal", "uo", "timing" });
+ public override IEnumerable FilterTerms => base.FilterTerms.Concat(new LocalisableString[] { "universal", "uo", "timing", "delay", "latency" });
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)
diff --git a/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
index 982cbec376..cf7f63211e 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
@@ -2,35 +2,27 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
-using osu.Framework.Bindables;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Localisation;
using osu.Game.Configuration;
-using osu.Game.Extensions;
using osu.Game.Localisation;
namespace osu.Game.Overlays.Settings.Sections.General
{
public partial class LanguageSettings : SettingsSubsection
{
- private SettingsDropdown languageSelection = null!;
- private Bindable