diff --git a/README.md b/README.md
index 67027bb9f3..6cc110280c 100644
--- a/README.md
+++ b/README.md
@@ -13,25 +13,17 @@ Rhythm is just a *click* away. The future of [osu!](https://osu.ppy.sh) and the
## Status
-This project is still heavily under development, but is in a state where users are encouraged to try it out and keep it installed alongside the stable *osu!* client. It will continue to evolve over the coming months and hopefully bring some new unique features to the table.
+This project is under heavy development, but is in a stable state. Users are encouraged to try it out and keep it installed alongside the stable *osu!* client. It will continue to evolve to the point of eventually replacing the existing stable client as an update.
-We are accepting bug reports (please report with as much detail as possible). Feature requests are welcome as long as you read and understand the contribution guidelines listed below.
+We are accepting bug reports (please report with as much detail as possible). Feature requests are also welcome, but understand that our focus is on completing the game to feature parity before adding new features. A few resources are available as starting points to getting involved and understanding the project:
-Detailed changelogs are published on the [official osu! site](https://osu.ppy.sh/home/changelog).
-
-## Requirements
-
-- A desktop platform with the [.NET Core 3.1 SDK](https://dotnet.microsoft.com/download) or higher installed.
-- When running on Linux, please have a system-wide FFmpeg installation available to support video decoding.
-- When running on Windows 7 or 8.1, **[additional prerequisites](https://docs.microsoft.com/en-us/dotnet/core/install/dependencies?tabs=netcore31&pivots=os-windows)** may be required to correctly run .NET Core applications if your operating system is not up-to-date with the latest service packs.
-- When developing with mobile, [Xamarin](https://docs.microsoft.com/en-us/xamarin/) is required, which is shipped together with Visual Studio or [Visual Studio for Mac](https://visualstudio.microsoft.com/vs/mac/).
-- When working with the codebase, we recommend using an IDE with intelligent code completion and syntax highlighting, such as [Visual Studio 2019+](https://visualstudio.microsoft.com/vs/), [JetBrains Rider](https://www.jetbrains.com/rider/) or [Visual Studio Code](https://code.visualstudio.com/).
+- Detailed release changelogs are available on the [official osu! site](https://osu.ppy.sh/home/changelog/lazer).
+- You can learn more about our approach to [project management](https://github.com/ppy/osu/wiki/Project-management).
+- Read peppy's [latest blog post](https://blog.ppy.sh/a-definitive-lazer-faq/) exploring where lazer is currently and the roadmap going forward.
## Running osu!
-### Releases
-
-If you are not interested in developing the game, you can still consume our [binary releases](https://github.com/ppy/osu/releases).
+If you are looking to install or test osu! without setting up a development environment, you can consume our [binary releases](https://github.com/ppy/osu/releases). Handy links below will download the latest version for your operating system of choice:
**Latest build:**
@@ -39,9 +31,19 @@ If you are not interested in developing the game, you can still consume our [bin
| ------------- | ------------- | ------------- | ------------- |
- **Linux** users are recommended to self-compile until we have official deployment in place.
+- When running on Windows 7 or 8.1, **[additional prerequisites](https://docs.microsoft.com/en-us/dotnet/core/install/dependencies?tabs=netcore31&pivots=os-windows)** may be required to correctly run .NET Core applications if your operating system is not up-to-date with the latest service packs.
If your platform is not listed above, there is still a chance you can manually build it by following the instructions below.
+## Developing or debugging
+
+Please make sure you have the following prerequisites:
+
+- A desktop platform with the [.NET Core 3.1 SDK](https://dotnet.microsoft.com/download) or higher installed.
+- When developing with mobile, [Xamarin](https://docs.microsoft.com/en-us/xamarin/) is required, which is shipped together with Visual Studio or [Visual Studio for Mac](https://visualstudio.microsoft.com/vs/mac/).
+- When working with the codebase, we recommend using an IDE with intelligent code completion and syntax highlighting, such as [Visual Studio 2019+](https://visualstudio.microsoft.com/vs/), [JetBrains Rider](https://www.jetbrains.com/rider/) or [Visual Studio Code](https://code.visualstudio.com/).
+- When running on Linux, please have a system-wide FFmpeg installation available to support video decoding.
+
### Downloading the source code
Clone the repository:
diff --git a/build/InspectCode.cake b/build/InspectCode.cake
index 06c56dce87..2e7a1d1b28 100644
--- a/build/InspectCode.cake
+++ b/build/InspectCode.cake
@@ -1,5 +1,5 @@
#addin "nuget:?package=CodeFileSanity&version=0.0.33"
-#addin "nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2019.3.0"
+#addin "nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2019.3.2"
#tool "nuget:?package=NVika.MSBuild&version=1.0.1"
var nVikaToolPath = GetFiles("./tools/NVika.MSBuild.*/tools/NVika.exe").First();
diff --git a/osu.Android.props b/osu.Android.props
index 494842f38f..b9ef783b2a 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -53,7 +53,7 @@
<Reference Include="Java.Interop" />
</ItemGroup>
<ItemGroup>
- <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
- <PackageReference Include="ppy.osu.Framework.Android" Version="2020.213.0" />
+ <PackageReference Include="ppy.osu.Game.Resources" Version="2020.219.0" />
+ <PackageReference Include="ppy.osu.Framework.Android" Version="2020.218.0" />
</ItemGroup>
</Project>
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-apple-overlay@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-apple-overlay@2x.png
new file mode 100644
index 0000000000..4233d9bb6e
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-apple-overlay@2x.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-apple@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-apple@2x.png
new file mode 100644
index 0000000000..043bfbfae1
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-apple@2x.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-bananas-overlay@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-bananas-overlay@2x.png
new file mode 100644
index 0000000000..4233d9bb6e
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-bananas-overlay@2x.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-bananas@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-bananas@2x.png
new file mode 100644
index 0000000000..043bfbfae1
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-bananas@2x.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-catcher-idle@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-catcher-idle@2x.png
new file mode 100644
index 0000000000..76949ccfcc
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-catcher-idle@2x.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-drop@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-drop@2x.png
new file mode 100644
index 0000000000..ec2fdbdbdb
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-drop@2x.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-grapes-overlay@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-grapes-overlay@2x.png
new file mode 100644
index 0000000000..4233d9bb6e
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-grapes-overlay@2x.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-grapes@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-grapes@2x.png
new file mode 100644
index 0000000000..043bfbfae1
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-grapes@2x.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-orange-overlay@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-orange-overlay@2x.png
new file mode 100644
index 0000000000..4233d9bb6e
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-orange-overlay@2x.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-orange@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-orange@2x.png
new file mode 100644
index 0000000000..043bfbfae1
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-orange@2x.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-pear-overlay@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-pear-overlay@2x.png
new file mode 100644
index 0000000000..4233d9bb6e
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-pear-overlay@2x.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-pear@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-pear@2x.png
new file mode 100644
index 0000000000..043bfbfae1
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-pear@2x.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-apple-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-apple-overlay.png
new file mode 100644
index 0000000000..8d9608cfc9
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-apple-overlay.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-apple.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-apple.png
new file mode 100644
index 0000000000..be1bda0383
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-apple.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-bananas-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-bananas-overlay.png
new file mode 100644
index 0000000000..3a6612378e
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-bananas-overlay.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-bananas.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-bananas.png
new file mode 100644
index 0000000000..afb8698b2d
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-bananas.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-drop.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-drop.png
new file mode 100644
index 0000000000..12c74f46e2
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-drop.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-grapes-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-grapes-overlay.png
new file mode 100644
index 0000000000..bb37ba1920
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-grapes-overlay.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-grapes.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-grapes.png
new file mode 100644
index 0000000000..10699b1f31
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-grapes.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-orange-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-orange-overlay.png
new file mode 100644
index 0000000000..e86aa6e7e3
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-orange-overlay.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-orange.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-orange.png
new file mode 100644
index 0000000000..42cc80399f
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-orange.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-pear-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-pear-overlay.png
new file mode 100644
index 0000000000..5c479da954
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-pear-overlay.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-pear.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-pear.png
new file mode 100644
index 0000000000..9fe400bdd1
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-pear.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-plate.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-plate.png
new file mode 100644
index 0000000000..1da1fdde85
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-plate.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-ryuuta.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-ryuuta.png
new file mode 100644
index 0000000000..f732092379
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-ryuuta.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit0.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit0.png
new file mode 100644
index 0000000000..2d312ceefd
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit0.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit100.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit100.png
new file mode 100644
index 0000000000..7884dc072d
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit100.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit300.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit300.png
new file mode 100644
index 0000000000..3e4ec2e047
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit300.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit50.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit50.png
new file mode 100644
index 0000000000..f02ad11a17
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit50.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple-overlay.png
new file mode 100755
index 0000000000..fe567d158d
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple-overlay.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple.png
new file mode 100755
index 0000000000..17f3be9c26
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas-overlay.png
new file mode 100755
index 0000000000..2c94ea78bf
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas-overlay.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas.png
new file mode 100755
index 0000000000..2c94ea78bf
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-fail.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-fail.png
new file mode 100755
index 0000000000..1eea5c2083
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-fail.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle.png
new file mode 100755
index 0000000000..17177f3246
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-kiai.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-kiai.png
new file mode 100755
index 0000000000..31be03b014
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-kiai.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop-overlay.png
new file mode 100755
index 0000000000..56bf4a92fb
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop-overlay.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop.png
new file mode 100755
index 0000000000..f259684055
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes-overlay.png
new file mode 100755
index 0000000000..17f3be9c26
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes-overlay.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes.png
new file mode 100755
index 0000000000..3dc60464cf
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange-overlay.png
new file mode 100755
index 0000000000..3dc60464cf
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange-overlay.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange.png
new file mode 100755
index 0000000000..3dc60464cf
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear-overlay.png
new file mode 100755
index 0000000000..3dc60464cf
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear-overlay.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear.png
new file mode 100755
index 0000000000..3dc60464cf
Binary files /dev/null and b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear.png differ
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index 9b529a2e4c..4ff9f7a7fe 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -3,104 +3,31 @@
using NUnit.Framework;
using osu.Framework.Allocation;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics;
using osu.Game.Rulesets.Catch.UI;
using osu.Game.Tests.Visual;
using System;
using System.Collections.Generic;
-using osu.Game.Skinning;
-using osu.Framework.Graphics.Shapes;
-using osuTK.Graphics;
-using osu.Framework.Audio.Sample;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics.Textures;
-using osu.Game.Audio;
-using osu.Game.Graphics.Sprites;
+using osu.Framework.Graphics;
namespace osu.Game.Rulesets.Catch.Tests
{
[TestFixture]
- public class TestSceneCatcher : OsuTestScene
+ public class TestSceneCatcher : SkinnableTestScene
{
public override IReadOnlyList<Type> RequiredTypes => new[]
{
- typeof(CatcherSprite),
+ typeof(CatcherArea),
};
- private readonly Container container;
-
- public TestSceneCatcher()
- {
- Child = container = new Container
- {
- Anchor = Anchor.Centre,
- Origin = Anchor.Centre,
- };
- }
-
[BackgroundDependencyLoader]
private void load()
{
- AddStep("show default catcher implementation", () => { container.Child = new CatcherSprite(); });
-
- AddStep("show custom catcher implementation", () =>
+ SetContents(() => new CatcherArea.Catcher
{
- container.Child = new CatchCustomSkinSourceContainer
- {
- Child = new CatcherSprite()
- };
+ RelativePositionAxes = Axes.None,
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
});
}
-
- private class CatcherCustomSkin : Container
- {
- public CatcherCustomSkin()
- {
- RelativeSizeAxes = Axes.Both;
-
- Children = new Drawable[]
- {
- new Box
- {
- RelativeSizeAxes = Axes.Both,
- Colour = Color4.Blue
- },
- new OsuSpriteText
- {
- Text = "custom"
- }
- };
- }
- }
-
- [Cached(typeof(ISkinSource))]
- private class CatchCustomSkinSourceContainer : Container, ISkinSource
- {
- public event Action SourceChanged
- {
- add { }
- remove { }
- }
-
- public Drawable GetDrawableComponent(ISkinComponent component)
- {
- switch (component.LookupName)
- {
- case "Gameplay/catch/fruit-catcher-idle":
- return new CatcherCustomSkin();
- }
-
- return null;
- }
-
- public SampleChannel GetSample(ISampleInfo sampleInfo) =>
- throw new NotImplementedException();
-
- public Texture GetTexture(string componentName) =>
- throw new NotImplementedException();
-
- public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
- }
}
}
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 3ae6886c31..83ea6359c2 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -3,8 +3,10 @@
using System;
using System.Collections.Generic;
+using System.Linq;
using NUnit.Framework;
using osu.Framework.Allocation;
+using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Catch.UI;
@@ -13,10 +15,9 @@ using osu.Game.Tests.Visual;
namespace osu.Game.Rulesets.Catch.Tests
{
[TestFixture]
- public class TestSceneCatcherArea : OsuTestScene
+ public class TestSceneCatcherArea : SkinnableTestScene
{
private RulesetInfo catchRuleset;
- private TestCatcherArea catcherArea;
public override IReadOnlyList<Type> RequiredTypes => new[]
{
@@ -26,20 +27,22 @@ namespace osu.Game.Rulesets.Catch.Tests
public TestSceneCatcherArea()
{
AddSliderStep<float>("CircleSize", 0, 8, 5, createCatcher);
- AddToggleStep("Hyperdash", t => catcherArea.ToggleHyperDash(t));
+ AddToggleStep("Hyperdash", t =>
+ CreatedDrawables.OfType<CatchInputManager>().Select(i => i.Child)
+ .OfType<TestCatcherArea>().ForEach(c => c.ToggleHyperDash(t)));
}
private void createCatcher(float size)
{
- Child = new CatchInputManager(catchRuleset)
+ SetContents(() => new CatchInputManager(catchRuleset)
{
RelativeSizeAxes = Axes.Both,
- Child = catcherArea = new TestCatcherArea(new BeatmapDifficulty { CircleSize = size })
+ Child = new TestCatcherArea(new BeatmapDifficulty { CircleSize = size })
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.TopLeft
},
- };
+ });
}
[BackgroundDependencyLoader]
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
index 44517382f7..51c821a1e8 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
@@ -5,7 +5,6 @@ using System;
using System.Collections.Generic;
using NUnit.Framework;
using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
using osu.Game.Rulesets.Catch.Objects;
using osu.Game.Rulesets.Catch.Objects.Drawable;
using osu.Game.Rulesets.Catch.Objects.Drawable.Pieces;
@@ -15,68 +14,58 @@ using osuTK;
namespace osu.Game.Rulesets.Catch.Tests
{
[TestFixture]
- public class TestSceneFruitObjects : OsuTestScene
+ public class TestSceneFruitObjects : SkinnableTestScene
{
public override IReadOnlyList<Type> RequiredTypes => new[]
{
typeof(CatchHitObject),
typeof(Fruit),
typeof(Droplet),
+ typeof(Banana),
+ typeof(BananaShower),
typeof(DrawableCatchHitObject),
typeof(DrawableFruit),
typeof(DrawableDroplet),
- typeof(BananaShower),
+ typeof(DrawableBanana),
+ typeof(DrawableBananaShower),
typeof(Pulp),
};
- public TestSceneFruitObjects()
+ protected override void LoadComplete()
{
- Add(new GridContainer
- {
- RelativeSizeAxes = Axes.Both,
- Content = new[]
- {
- new Drawable[]
- {
- createDrawable(0),
- createDrawable(1),
- createDrawable(2),
- },
- new Drawable[]
- {
- createDrawable(3),
- createDrawable(4),
- createDrawable(5),
- },
- }
- });
+ base.LoadComplete();
+
+ foreach (FruitVisualRepresentation rep in Enum.GetValues(typeof(FruitVisualRepresentation)))
+ AddStep($"show {rep}", () => SetContents(() => createDrawable(rep)));
}
- private DrawableFruit createDrawable(int index)
+ private DrawableFruit createDrawable(FruitVisualRepresentation rep)
{
- Fruit fruit = index == 5
- ? new Banana
- {
- StartTime = 1000000000000,
- IndexInBeatmap = index,
- Scale = 1.5f,
- }
- : new Fruit
- {
- StartTime = 1000000000000,
- IndexInBeatmap = index,
- Scale = 1.5f,
- };
+ Fruit fruit = new TestCatchFruit(rep)
+ {
+ StartTime = 1000000000000,
+ Scale = 1.5f,
+ };
return new DrawableFruit(fruit)
{
Anchor = Anchor.Centre,
- RelativePositionAxes = Axes.Both,
+ RelativePositionAxes = Axes.None,
Position = Vector2.Zero,
Alpha = 1,
LifetimeStart = double.NegativeInfinity,
LifetimeEnd = double.PositiveInfinity,
};
}
+
+ private class TestCatchFruit : Fruit
+ {
+ public TestCatchFruit(FruitVisualRepresentation rep)
+ {
+ VisualRepresentation = rep;
+ }
+
+ public override FruitVisualRepresentation VisualRepresentation { get; }
+ }
}
}
diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index db52fbac1b..1a5d0f983b 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -34,9 +34,14 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
foreach (var obj in Beatmap.HitObjects.OfType<CatchHitObject>())
{
- obj.IndexInBeatmap = index++;
+ obj.IndexInBeatmap = index;
+ foreach (var nested in obj.NestedHitObjects.OfType<CatchHitObject>())
+ nested.IndexInBeatmap = index;
+
if (obj.LastInCombo && obj.NestedHitObjects.LastOrDefault() is IHasComboInformation lastNested)
lastNested.LastInCombo = true;
+
+ index++;
}
}
diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index e4ad49ea50..5243091625 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Catch.Objects
public int IndexInBeatmap { get; set; }
- public virtual FruitVisualRepresentation VisualRepresentation => (FruitVisualRepresentation)(ComboIndex % 4);
+ public virtual FruitVisualRepresentation VisualRepresentation => (FruitVisualRepresentation)(IndexInBeatmap % 4);
public virtual bool NewCombo { get; set; }
@@ -100,8 +100,8 @@ namespace osu.Game.Rulesets.Catch.Objects
{
Pear,
Grape,
- Raspberry,
Pineapple,
+ Raspberry,
Banana // banananananannaanana
}
}
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index b014b32305..11e2466275 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Catch.Objects
Samples = tickSamples,
StartTime = t + lastEvent.Value.Time,
X = X + Path.PositionAt(
- lastEvent.Value.PathProgress + (t / sinceLastTick) * (e.PathProgress - lastEvent.Value.PathProgress)).X / CatchPlayfield.BASE_WIDTH,
+ lastEvent.Value.PathProgress + (t / sinceLastTick) * (e.PathProgress - lastEvent.Value.PathProgress)).X / CatchPlayfield.BASE_WIDTH,
});
}
}
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 1de0b6bfa3..1ad12dc4ad 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -63,6 +63,7 @@ namespace osu.Game.Rulesets.Catch.UI
if (result.IsHit && fruit.CanBePlated)
{
+ // create a new (cloned) fruit to stay on the plate. the original is faded out immediately.
var caughtFruit = (DrawableCatchHitObject)CreateDrawableRepresentation?.Invoke(fruit.HitObject);
if (caughtFruit == null) return;
@@ -133,7 +134,6 @@ namespace osu.Game.Rulesets.Catch.UI
X = 0.5f;
Origin = Anchor.TopCentre;
- Anchor = Anchor.TopLeft;
Size = new Vector2(CATCHER_SIZE);
if (difficulty != null)
@@ -388,32 +388,24 @@ namespace osu.Game.Rulesets.Catch.UI
}
}
+ public void UpdatePosition(float position)
+ {
+ position = Math.Clamp(position, 0, 1);
+
+ if (position == X)
+ return;
+
+ Scale = new Vector2(Math.Abs(Scale.X) * (position > X ? 1 : -1), Scale.Y);
+ X = position;
+ }
+
/// <summary>
/// Drop any fruit off the plate.
/// </summary>
public void Drop()
{
- var fruit = caughtFruit.ToArray();
-
- foreach (var f in fruit)
- {
- if (ExplodingFruitTarget != null)
- {
- f.Anchor = Anchor.TopLeft;
- f.Position = caughtFruit.ToSpaceOfOtherDrawable(f.DrawPosition, ExplodingFruitTarget);
-
- caughtFruit.Remove(f);
-
- ExplodingFruitTarget.Add(f);
- }
-
- f.MoveToY(f.Y + 75, 750, Easing.InSine);
- f.FadeOut(750);
-
- // todo: this shouldn't exist once DrawableHitObject's ClearTransformsAfter overrides are repaired.
- f.LifetimeStart = Time.Current;
- f.Expire();
- }
+ foreach (var f in caughtFruit.ToArray())
+ Drop(f);
}
/// <summary>
@@ -425,10 +417,26 @@ namespace osu.Game.Rulesets.Catch.UI
Explode(f);
}
+ public void Drop(DrawableHitObject fruit) => removeFromPlateWithTransform(fruit, f =>
+ {
+ f.MoveToY(f.Y + 75, 750, Easing.InSine);
+ f.FadeOut(750);
+ });
+
public void Explode(DrawableHitObject fruit)
{
var originalX = fruit.X * Scale.X;
+ removeFromPlateWithTransform(fruit, f =>
+ {
+ f.MoveToY(f.Y - 50, 250, Easing.OutSine).Then().MoveToY(f.Y + 50, 500, Easing.InSine);
+ f.MoveToX(f.X + originalX * 6, 1000);
+ f.FadeOut(750);
+ });
+ }
+
+ private void removeFromPlateWithTransform(DrawableHitObject fruit, Action<DrawableHitObject> action)
+ {
if (ExplodingFruitTarget != null)
{
fruit.Anchor = Anchor.TopLeft;
@@ -442,25 +450,18 @@ namespace osu.Game.Rulesets.Catch.UI
ExplodingFruitTarget.Add(fruit);
}
- fruit.ClearTransforms();
- fruit.MoveToY(fruit.Y - 50, 250, Easing.OutSine).Then().MoveToY(fruit.Y + 50, 500, Easing.InSine);
- fruit.MoveToX(fruit.X + originalX * 6, 1000);
- fruit.FadeOut(750);
+ double actionTime = Clock.CurrentTime;
- // todo: this shouldn't exist once DrawableHitObject's ClearTransformsAfter overrides are repaired.
- fruit.LifetimeStart = Time.Current;
- fruit.Expire();
- }
+ fruit.ApplyCustomUpdateState += onFruitOnApplyCustomUpdateState;
+ onFruitOnApplyCustomUpdateState(fruit, fruit.State.Value);
- public void UpdatePosition(float position)
- {
- position = Math.Clamp(position, 0, 1);
+ void onFruitOnApplyCustomUpdateState(DrawableHitObject o, ArmedState state)
+ {
+ using (fruit.BeginAbsoluteSequence(actionTime))
+ action(fruit);
- if (position == X)
- return;
-
- Scale = new Vector2(Math.Abs(Scale.X) * (position > X ? 1 : -1), Scale.Y);
- X = position;
+ fruit.Expire();
+ }
}
}
}
diff --git a/osu.Game.Rulesets.Osu.Tests/SkinnableTestScene.cs b/osu.Game.Rulesets.Osu.Tests/SkinnableTestScene.cs
deleted file mode 100644
index d4c3000d3f..0000000000
--- a/osu.Game.Rulesets.Osu.Tests/SkinnableTestScene.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using System.Text.RegularExpressions;
-using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Textures;
-using osu.Framework.IO.Stores;
-using osu.Game.Skinning;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Rulesets.Osu.Tests
-{
- public abstract class SkinnableTestScene : OsuGridTestScene
- {
- private Skin metricsSkin;
- private Skin defaultSkin;
- private Skin specialSkin;
- private Skin oldSkin;
-
- protected SkinnableTestScene()
- : base(2, 3)
- {
- }
-
- [BackgroundDependencyLoader]
- private void load(AudioManager audio, SkinManager skinManager)
- {
- var dllStore = new DllResourceStore(typeof(SkinnableTestScene).Assembly);
-
- metricsSkin = new TestLegacySkin(new SkinInfo(), new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), audio, true);
- defaultSkin = skinManager.GetSkin(DefaultLegacySkin.Info);
- specialSkin = new TestLegacySkin(new SkinInfo(), new NamespacedResourceStore<byte[]>(dllStore, "Resources/special_skin"), audio, true);
- oldSkin = new TestLegacySkin(new SkinInfo(), new NamespacedResourceStore<byte[]>(dllStore, "Resources/old_skin"), audio, true);
- }
-
- public void SetContents(Func<Drawable> creationFunction)
- {
- Cell(0).Child = createProvider(null, creationFunction);
- Cell(1).Child = createProvider(metricsSkin, creationFunction);
- Cell(2).Child = createProvider(defaultSkin, creationFunction);
- Cell(3).Child = createProvider(specialSkin, creationFunction);
- Cell(4).Child = createProvider(oldSkin, creationFunction);
- }
-
- private Drawable createProvider(Skin skin, Func<Drawable> creationFunction)
- {
- var mainProvider = new SkinProvidingContainer(skin);
-
- return mainProvider
- .WithChild(new SkinProvidingContainer(Ruleset.Value.CreateInstance().CreateLegacySkinProvider(mainProvider))
- {
- Child = creationFunction()
- });
- }
-
- private class TestLegacySkin : LegacySkin
- {
- private readonly bool extrapolateAnimations;
-
- public TestLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, AudioManager audioManager, bool extrapolateAnimations)
- : base(skin, storage, audioManager, "skin.ini")
- {
- this.extrapolateAnimations = extrapolateAnimations;
- }
-
- public override Texture GetTexture(string componentName)
- {
- // extrapolate frames to test longer animations
- if (extrapolateAnimations)
- {
- var match = Regex.Match(componentName, "-([0-9]*)");
-
- if (match.Length > 0 && int.TryParse(match.Groups[1].Value, out var number) && number < 60)
- return base.GetTexture(componentName.Replace($"-{number}", $"-{number % 2}"));
- }
-
- return base.GetTexture(componentName);
- }
- }
- }
-}
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
index ac627aa23e..02d4406809 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
@@ -10,6 +10,7 @@ using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Osu.Objects.Drawables;
using osu.Game.Rulesets.Scoring;
+using osu.Game.Tests.Visual;
namespace osu.Game.Rulesets.Osu.Tests
{
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
index aa170eae1e..7b96e2ec6a 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
@@ -7,7 +7,10 @@ using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Testing.Input;
+using osu.Game.Configuration;
using osu.Game.Rulesets.Osu.UI.Cursor;
+using osu.Game.Screens.Play;
+using osu.Game.Tests.Visual;
using osuTK;
namespace osu.Game.Rulesets.Osu.Tests
@@ -21,12 +24,50 @@ namespace osu.Game.Rulesets.Osu.Tests
typeof(CursorTrail)
};
- [BackgroundDependencyLoader]
- private void load()
+ [Cached]
+ private GameplayBeatmap gameplayBeatmap;
+
+ private ClickingCursorContainer lastContainer;
+
+ [Resolved]
+ private OsuConfigManager config { get; set; }
+
+ public TestSceneGameplayCursor()
+ {
+ gameplayBeatmap = new GameplayBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo));
+ }
+
+ [TestCase(1, 1)]
+ [TestCase(5, 1)]
+ [TestCase(10, 1)]
+ [TestCase(1, 1.5f)]
+ [TestCase(5, 1.5f)]
+ [TestCase(10, 1.5f)]
+ public void TestSizing(int circleSize, float userScale)
+ {
+ AddStep($"set user scale to {userScale}", () => config.Set(OsuSetting.GameplayCursorSize, userScale));
+ AddStep($"adjust cs to {circleSize}", () => gameplayBeatmap.BeatmapInfo.BaseDifficulty.CircleSize = circleSize);
+ AddStep("turn on autosizing", () => config.Set(OsuSetting.AutoCursorSize, true));
+
+ AddStep("load content", loadContent);
+
+ AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.Scale.X == OsuCursorContainer.GetScaleForCircleSize(circleSize) * userScale);
+
+ AddStep("set user scale to 1", () => config.Set(OsuSetting.GameplayCursorSize, 1f));
+ AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.Scale.X == OsuCursorContainer.GetScaleForCircleSize(circleSize));
+
+ AddStep("turn off autosizing", () => config.Set(OsuSetting.AutoCursorSize, false));
+ AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.Scale.X == 1);
+
+ AddStep($"set user scale to {userScale}", () => config.Set(OsuSetting.GameplayCursorSize, userScale));
+ AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.Scale.X == userScale);
+ }
+
+ private void loadContent()
{
SetContents(() => new MovingCursorInputManager
{
- Child = new ClickingCursorContainer
+ Child = lastContainer = new ClickingCursorContainer
{
RelativeSizeAxes = Axes.Both,
Masking = true,
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
index 098e277fff..ae5a28217c 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
@@ -14,6 +14,7 @@ using osu.Game.Rulesets.Mods;
using System.Linq;
using NUnit.Framework;
using osu.Game.Rulesets.Scoring;
+using osu.Game.Tests.Visual;
namespace osu.Game.Rulesets.Osu.Tests
{
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
index e8386363be..defd3a6f22 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
@@ -22,6 +22,7 @@ using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Objects.Types;
using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+using osu.Game.Tests.Visual;
namespace osu.Game.Rulesets.Osu.Tests
{
diff --git a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
index 22b4c3e82e..a8719e0aa8 100644
--- a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
+++ b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Rulesets.Osu.Edit
if (existing == null)
return;
+ hitObject.RemoveTransform(existing);
+
using (hitObject.BeginAbsoluteSequence(existing.StartTime))
hitObject.FadeOut(editor_hit_object_fade_out_extension).Expire();
break;
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
index 649b01c132..6286c80d7c 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
@@ -9,6 +9,7 @@ using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Objects.Types;
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Replays;
using osu.Game.Rulesets.UI;
using static osu.Game.Input.Handlers.ReplayInputHandler;
@@ -19,69 +20,18 @@ namespace osu.Game.Rulesets.Osu.Mods
public override string Description => @"You don't need to click. Give your clicking/tapping fingers a break from the heat of things.";
public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(OsuModAutopilot)).ToArray();
- public void Update(Playfield playfield)
- {
- bool requiresHold = false;
- bool requiresHit = false;
+ /// <summary>
+ /// How early before a hitobject's start time to trigger a hit.
+ /// </summary>
+ private const float relax_leniency = 3;
- const float relax_leniency = 3;
-
- foreach (var drawable in playfield.HitObjectContainer.AliveObjects)
- {
- if (!(drawable is DrawableOsuHitObject osuHit))
- continue;
-
- double time = osuHit.Clock.CurrentTime;
- double relativetime = time - osuHit.HitObject.StartTime;
-
- if (time < osuHit.HitObject.StartTime - relax_leniency) continue;
-
- if ((osuHit.HitObject is IHasEndTime hasEnd && time > hasEnd.EndTime) || osuHit.IsHit)
- continue;
-
- if (osuHit is DrawableHitCircle && osuHit.IsHovered)
- {
- Debug.Assert(osuHit.HitObject.HitWindows != null);
- requiresHit |= osuHit.HitObject.HitWindows.CanBeHit(relativetime);
- }
-
- requiresHold |= (osuHit is DrawableSlider slider && (slider.Ball.IsHovered || osuHit.IsHovered)) || osuHit is DrawableSpinner;
- }
-
- if (requiresHit)
- {
- addAction(false);
- addAction(true);
- }
-
- addAction(requiresHold);
- }
-
- private bool wasHit;
+ private bool isDownState;
private bool wasLeft;
private OsuInputManager osuInputManager;
- private void addAction(bool hitting)
- {
- if (wasHit == hitting)
- return;
-
- wasHit = hitting;
-
- var state = new ReplayState<OsuAction>
- {
- PressedActions = new List<OsuAction>()
- };
-
- if (hitting)
- {
- state.PressedActions.Add(wasLeft ? OsuAction.LeftButton : OsuAction.RightButton);
- wasLeft = !wasLeft;
- }
-
- state.Apply(osuInputManager.CurrentState, osuInputManager);
- }
+ private ReplayState<OsuAction> state;
+ private double lastStateChangeTime;
public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
{
@@ -89,5 +39,85 @@ namespace osu.Game.Rulesets.Osu.Mods
osuInputManager = (OsuInputManager)drawableRuleset.KeyBindingInputManager;
osuInputManager.AllowUserPresses = false;
}
+
+ public void Update(Playfield playfield)
+ {
+ bool requiresHold = false;
+ bool requiresHit = false;
+
+ double time = playfield.Clock.CurrentTime;
+
+ foreach (var h in playfield.HitObjectContainer.AliveObjects.OfType<DrawableOsuHitObject>())
+ {
+ // we are not yet close enough to the object.
+ if (time < h.HitObject.StartTime - relax_leniency)
+ break;
+
+ // already hit or beyond the hittable end time.
+ if (h.IsHit || (h.HitObject is IHasEndTime hasEnd && time > hasEnd.EndTime))
+ continue;
+
+ switch (h)
+ {
+ case DrawableHitCircle circle:
+ handleHitCircle(circle);
+ break;
+
+ case DrawableSlider slider:
+ // Handles cases like "2B" beatmaps, where sliders may be overlapping and simply holding is not enough.
+ if (!slider.HeadCircle.IsHit)
+ handleHitCircle(slider.HeadCircle);
+
+ requiresHold |= slider.Ball.IsHovered || h.IsHovered;
+ break;
+
+ case DrawableSpinner _:
+ requiresHold = true;
+ break;
+ }
+ }
+
+ if (requiresHit)
+ {
+ changeState(false);
+ changeState(true);
+ }
+
+ if (requiresHold)
+ changeState(true);
+ else if (isDownState && time - lastStateChangeTime > AutoGenerator.KEY_UP_DELAY)
+ changeState(false);
+
+ void handleHitCircle(DrawableHitCircle circle)
+ {
+ if (!circle.IsHovered)
+ return;
+
+ Debug.Assert(circle.HitObject.HitWindows != null);
+ requiresHit |= circle.HitObject.HitWindows.CanBeHit(time - circle.HitObject.StartTime);
+ }
+
+ void changeState(bool down)
+ {
+ if (isDownState == down)
+ return;
+
+ isDownState = down;
+ lastStateChangeTime = time;
+
+ state = new ReplayState<OsuAction>
+ {
+ PressedActions = new List<OsuAction>()
+ };
+
+ if (down)
+ {
+ state.PressedActions.Add(wasLeft ? OsuAction.LeftButton : OsuAction.RightButton);
+ wasLeft = !wasLeft;
+ }
+
+ state?.Apply(osuInputManager.CurrentState, osuInputManager);
+ }
+ }
}
}
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
index cc664ae72e..41daef1f38 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Sprites;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
using osuTK;
namespace osu.Game.Rulesets.Osu.Mods
@@ -27,26 +28,40 @@ namespace osu.Game.Rulesets.Osu.Mods
public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
{
foreach (var drawable in drawables)
+ drawable.ApplyCustomUpdateState += applyTransform;
+ }
+
+ private void applyTransform(DrawableHitObject drawable, ArmedState state)
+ {
+ switch (drawable)
{
- var hitObject = (OsuHitObject)drawable.HitObject;
+ case DrawableSliderHead _:
+ case DrawableSliderTail _:
+ case DrawableSliderTick _:
+ case DrawableRepeatPoint _:
+ return;
- float appearDistance = (float)(hitObject.TimePreempt - hitObject.TimeFadeIn) / 2;
+ default:
+ var hitObject = (OsuHitObject)drawable.HitObject;
- Vector2 originalPosition = drawable.Position;
- Vector2 appearOffset = new Vector2(MathF.Cos(theta), MathF.Sin(theta)) * appearDistance;
+ float appearDistance = (float)(hitObject.TimePreempt - hitObject.TimeFadeIn) / 2;
- //the - 1 and + 1 prevents the hit objects to appear in the wrong position.
- double appearTime = hitObject.StartTime - hitObject.TimePreempt - 1;
- double moveDuration = hitObject.TimePreempt + 1;
+ Vector2 originalPosition = drawable.Position;
+ Vector2 appearOffset = new Vector2(MathF.Cos(theta), MathF.Sin(theta)) * appearDistance;
- using (drawable.BeginAbsoluteSequence(appearTime, true))
- {
- drawable
- .MoveToOffset(appearOffset)
- .MoveTo(originalPosition, moveDuration, Easing.InOutSine);
- }
+ //the - 1 and + 1 prevents the hit objects to appear in the wrong position.
+ double appearTime = hitObject.StartTime - hitObject.TimePreempt - 1;
+ double moveDuration = hitObject.TimePreempt + 1;
- theta += (float)hitObject.TimeFadeIn / 1000;
+ using (drawable.BeginAbsoluteSequence(appearTime, true))
+ {
+ drawable
+ .MoveToOffset(appearOffset)
+ .MoveTo(originalPosition, moveDuration, Easing.InOutSine);
+ }
+
+ theta += (float)hitObject.TimeFadeIn / 1000;
+ break;
}
}
}
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 95fb6d9d48..77f8ec6cc8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -116,8 +116,7 @@ namespace osu.Game.Rulesets.Osu.Objects
public Slider()
{
- SamplesBindable.ItemsAdded += _ => updateNestedSamples();
- SamplesBindable.ItemsRemoved += _ => updateNestedSamples();
+ SamplesBindable.CollectionChanged += (_, __) => updateNestedSamples();
Path.Version.ValueChanged += _ => updateNestedPositions();
}
diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
index 79b5d1b7f8..28600ef55b 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
@@ -12,6 +12,7 @@ using osu.Game.Beatmaps;
using osu.Game.Configuration;
using osu.Game.Rulesets.Osu.Configuration;
using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Play;
using osu.Game.Skinning;
using osuTK;
@@ -29,10 +30,10 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
private readonly Drawable cursorTrail;
- public Bindable<float> CursorScale;
+ public Bindable<float> CursorScale = new BindableFloat(1);
+
private Bindable<float> userCursorScale;
private Bindable<bool> autoCursorScale;
- private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
public OsuCursorContainer()
{
@@ -43,37 +44,16 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
};
}
+ [Resolved(canBeNull: true)]
+ private GameplayBeatmap beatmap { get; set; }
+
+ [Resolved]
+ private OsuConfigManager config { get; set; }
+
[BackgroundDependencyLoader(true)]
- private void load(OsuConfigManager config, OsuRulesetConfigManager rulesetConfig, IBindable<WorkingBeatmap> beatmap)
+ private void load(OsuConfigManager config, OsuRulesetConfigManager rulesetConfig)
{
rulesetConfig?.BindWith(OsuRulesetSetting.ShowCursorTrail, showTrail);
-
- this.beatmap.BindTo(beatmap);
- this.beatmap.ValueChanged += _ => calculateScale();
-
- userCursorScale = config.GetBindable<float>(OsuSetting.GameplayCursorSize);
- userCursorScale.ValueChanged += _ => calculateScale();
-
- autoCursorScale = config.GetBindable<bool>(OsuSetting.AutoCursorSize);
- autoCursorScale.ValueChanged += _ => calculateScale();
-
- CursorScale = new BindableFloat();
- CursorScale.ValueChanged += e => ActiveCursor.Scale = cursorTrail.Scale = new Vector2(e.NewValue);
-
- calculateScale();
- }
-
- private void calculateScale()
- {
- float scale = userCursorScale.Value;
-
- if (autoCursorScale.Value && beatmap.Value != null)
- {
- // if we have a beatmap available, let's get its circle size to figure out an automatic cursor scale modifier.
- scale *= 1f - 0.7f * (1f + beatmap.Value.BeatmapInfo.BaseDifficulty.CircleSize - BeatmapDifficulty.DEFAULT_DIFFICULTY) / BeatmapDifficulty.DEFAULT_DIFFICULTY;
- }
-
- CursorScale.Value = scale;
}
protected override void LoadComplete()
@@ -81,6 +61,46 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
base.LoadComplete();
showTrail.BindValueChanged(v => cursorTrail.FadeTo(v.NewValue ? 1 : 0, 200), true);
+
+ userCursorScale = config.GetBindable<float>(OsuSetting.GameplayCursorSize);
+ userCursorScale.ValueChanged += _ => calculateScale();
+
+ autoCursorScale = config.GetBindable<bool>(OsuSetting.AutoCursorSize);
+ autoCursorScale.ValueChanged += _ => calculateScale();
+
+ CursorScale.ValueChanged += e =>
+ {
+ var newScale = new Vector2(e.NewValue);
+
+ ActiveCursor.Scale = newScale;
+ cursorTrail.Scale = newScale;
+ };
+
+ calculateScale();
+ }
+
+ /// <summary>
+ /// Get the scale applicable to the ActiveCursor based on a beatmap's circle size.
+ /// </summary>
+ public static float GetScaleForCircleSize(float circleSize) =>
+ 1f - 0.7f * (1f + circleSize - BeatmapDifficulty.DEFAULT_DIFFICULTY) / BeatmapDifficulty.DEFAULT_DIFFICULTY;
+
+ private void calculateScale()
+ {
+ float scale = userCursorScale.Value;
+
+ if (autoCursorScale.Value && beatmap != null)
+ {
+ // if we have a beatmap available, let's get its circle size to figure out an automatic cursor scale modifier.
+ scale *= GetScaleForCircleSize(beatmap.BeatmapInfo.BaseDifficulty.CircleSize);
+ }
+
+ CursorScale.Value = scale;
+
+ var newScale = new Vector2(scale);
+
+ ActiveCursor.ScaleTo(newScale, 400, Easing.OutQuint);
+ cursorTrail.Scale = newScale;
}
private int downCount;
diff --git a/osu.Game.Tests/Resources/Archives/ogg-beatmap.osz b/osu.Game.Tests/Resources/Archives/ogg-beatmap.osz
new file mode 100644
index 0000000000..f264a8dda2
Binary files /dev/null and b/osu.Game.Tests/Resources/Archives/ogg-beatmap.osz differ
diff --git a/osu.Game.Tests/Resources/Archives/ogg-skin.osk b/osu.Game.Tests/Resources/Archives/ogg-skin.osk
new file mode 100644
index 0000000000..d7379446aa
Binary files /dev/null and b/osu.Game.Tests/Resources/Archives/ogg-skin.osk differ
diff --git a/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs b/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
new file mode 100644
index 0000000000..4d3b73fb32
--- /dev/null
+++ b/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
@@ -0,0 +1,37 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
+using osu.Framework.Testing;
+using osu.Game.Audio;
+using osu.Game.Beatmaps;
+using osu.Game.IO.Archives;
+using osu.Game.Tests.Resources;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Skins
+{
+ [HeadlessTest]
+ public class TestSceneBeatmapSkinResources : OsuTestScene
+ {
+ [Resolved]
+ private BeatmapManager beatmaps { get; set; }
+
+ private WorkingBeatmap beatmap;
+
+ [BackgroundDependencyLoader]
+ private void load()
+ {
+ var imported = beatmaps.Import(new ZipArchiveReader(TestResources.OpenResource("Archives/ogg-beatmap.osz"))).Result;
+ beatmap = beatmaps.GetWorkingBeatmap(imported.Beatmaps[0]);
+ }
+
+ [Test]
+ public void TestRetrieveOggSample() => AddAssert("sample is non-null", () => beatmap.Skin.GetSample(new SampleInfo("sample")) != null);
+
+ [Test]
+ public void TestRetrieveOggTrack() => AddAssert("track is non-null", () => !(beatmap.Track is TrackVirtual));
+ }
+}
diff --git a/osu.Game.Tests/Skins/TestSceneSkinResources.cs b/osu.Game.Tests/Skins/TestSceneSkinResources.cs
new file mode 100644
index 0000000000..107a96292f
--- /dev/null
+++ b/osu.Game.Tests/Skins/TestSceneSkinResources.cs
@@ -0,0 +1,33 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Testing;
+using osu.Game.Audio;
+using osu.Game.IO.Archives;
+using osu.Game.Skinning;
+using osu.Game.Tests.Resources;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Skins
+{
+ [HeadlessTest]
+ public class TestSceneSkinResources : OsuTestScene
+ {
+ [Resolved]
+ private SkinManager skins { get; set; }
+
+ private ISkin skin;
+
+ [BackgroundDependencyLoader]
+ private void load()
+ {
+ var imported = skins.Import(new ZipArchiveReader(TestResources.OpenResource("Archives/ogg-skin.osk"))).Result;
+ skin = skins.GetSkin(imported);
+ }
+
+ [Test]
+ public void TestRetrieveOggSample() => AddAssert("sample is non-null", () => skin.GetSample(new SampleInfo("sample")) != null);
+ }
+}
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 33ecbed62e..100f99d130 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -91,9 +91,44 @@ namespace osu.Game.Tests.Visual.Gameplay
{
AddStep("load dummy beatmap", () => ResetPlayer(false));
AddUntilStep("wait for current", () => loader.IsCurrentScreen());
- AddRepeatStep("move mouse", () => InputManager.MoveMouseTo(loader.VisualSettings.ScreenSpaceDrawQuad.TopLeft + (loader.VisualSettings.ScreenSpaceDrawQuad.BottomRight - loader.VisualSettings.ScreenSpaceDrawQuad.TopLeft) * RNG.NextSingle()), 20);
+
+ AddUntilStep("wait for load ready", () =>
+ {
+ moveMouse();
+ return player.LoadState == LoadState.Ready;
+ });
+ AddRepeatStep("move mouse", moveMouse, 20);
+
AddAssert("loader still active", () => loader.IsCurrentScreen());
AddUntilStep("loads after idle", () => !loader.IsCurrentScreen());
+
+ void moveMouse()
+ {
+ InputManager.MoveMouseTo(
+ loader.VisualSettings.ScreenSpaceDrawQuad.TopLeft
+ + (loader.VisualSettings.ScreenSpaceDrawQuad.BottomRight - loader.VisualSettings.ScreenSpaceDrawQuad.TopLeft)
+ * RNG.NextSingle());
+ }
+ }
+
+ [Test]
+ public void TestBlockLoadViaFocus()
+ {
+ OsuFocusedOverlayContainer overlay = null;
+
+ AddStep("load dummy beatmap", () => ResetPlayer(false));
+ AddUntilStep("wait for current", () => loader.IsCurrentScreen());
+
+ AddStep("show focused overlay", () => { container.Add(overlay = new ChangelogOverlay { State = { Value = Visibility.Visible } }); });
+ AddUntilStep("overlay visible", () => overlay.IsPresent);
+
+ AddUntilStep("wait for load ready", () => player.LoadState == LoadState.Ready);
+ AddRepeatStep("twiddle thumbs", () => { }, 20);
+
+ AddAssert("loader still active", () => loader.IsCurrentScreen());
+
+ AddStep("hide overlay", () => overlay.Hide());
+ AddUntilStep("loads after idle", () => !loader.IsCurrentScreen());
}
[Test]
@@ -159,13 +194,22 @@ namespace osu.Game.Tests.Visual.Gameplay
}
[Test]
- public void TestMutedNotificationMasterVolume() => addVolumeSteps("master volume", () => audioManager.Volume.Value = 0, null, () => audioManager.Volume.IsDefault);
+ public void TestMutedNotificationMasterVolume()
+ {
+ addVolumeSteps("master volume", () => audioManager.Volume.Value = 0, null, () => audioManager.Volume.IsDefault);
+ }
[Test]
- public void TestMutedNotificationTrackVolume() => addVolumeSteps("music volume", () => audioManager.VolumeTrack.Value = 0, null, () => audioManager.VolumeTrack.IsDefault);
+ public void TestMutedNotificationTrackVolume()
+ {
+ addVolumeSteps("music volume", () => audioManager.VolumeTrack.Value = 0, null, () => audioManager.VolumeTrack.IsDefault);
+ }
[Test]
- public void TestMutedNotificationMuteButton() => addVolumeSteps("mute button", null, () => container.VolumeOverlay.IsMuted.Value = true, () => !container.VolumeOverlay.IsMuted.Value);
+ public void TestMutedNotificationMuteButton()
+ {
+ addVolumeSteps("mute button", null, () => container.VolumeOverlay.IsMuted.Value = true, () => !container.VolumeOverlay.IsMuted.Value);
+ }
/// <remarks>
/// Created for avoiding copy pasting code for the same steps.
@@ -179,7 +223,7 @@ namespace osu.Game.Tests.Visual.Gameplay
AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.MutedAudioNotificationShownOnce).Value = false);
AddStep("load player", () => ResetPlayer(false, beforeLoad, afterLoad));
- AddUntilStep("wait for player", () => player.IsLoaded);
+ AddUntilStep("wait for player", () => player.LoadState == LoadState.Ready);
AddAssert("check for notification", () => container.NotificationOverlay.UnreadCount.Value == 1);
AddStep("click notification", () =>
@@ -193,6 +237,8 @@ namespace osu.Game.Tests.Visual.Gameplay
});
AddAssert("check " + volumeName, assert);
+
+ AddUntilStep("wait for player load", () => player.IsLoaded);
}
private class TestPlayerLoaderContainer : Container
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
new file mode 100644
index 0000000000..9fbe8f7ffe
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -0,0 +1,255 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. 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 NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Screens.Multi;
+using osu.Game.Tests.Beatmaps;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+ public class TestSceneDrawableRoomPlaylist : ManualInputManagerTestScene
+ {
+ public override IReadOnlyList<Type> RequiredTypes => new[]
+ {
+ typeof(DrawableRoomPlaylist),
+ typeof(DrawableRoomPlaylistItem)
+ };
+
+ private TestPlaylist playlist;
+
+ [Test]
+ public void TestNonEditableNonSelectable()
+ {
+ createPlaylist(false, false);
+
+ moveToItem(0);
+ assertHandleVisibility(0, false);
+ assertDeleteButtonVisibility(0, false);
+
+ AddStep("click", () => InputManager.Click(MouseButton.Left));
+ AddAssert("no item selected", () => playlist.SelectedItem.Value == null);
+ }
+
+ [Test]
+ public void TestEditable()
+ {
+ createPlaylist(true, false);
+
+ moveToItem(0);
+ assertHandleVisibility(0, true);
+ assertDeleteButtonVisibility(0, true);
+
+ AddStep("click", () => InputManager.Click(MouseButton.Left));
+ AddAssert("no item selected", () => playlist.SelectedItem.Value == null);
+ }
+
+ [Test]
+ public void TestSelectable()
+ {
+ createPlaylist(false, true);
+
+ moveToItem(0);
+ assertHandleVisibility(0, false);
+ assertDeleteButtonVisibility(0, false);
+
+ AddStep("click", () => InputManager.Click(MouseButton.Left));
+
+ AddAssert("item 0 is selected", () => playlist.SelectedItem.Value == playlist.Items[0]);
+ }
+
+ [Test]
+ public void TestEditableSelectable()
+ {
+ createPlaylist(true, true);
+
+ moveToItem(0);
+ assertHandleVisibility(0, true);
+ assertDeleteButtonVisibility(0, true);
+
+ AddStep("click", () => InputManager.Click(MouseButton.Left));
+
+ AddAssert("item 0 is selected", () => playlist.SelectedItem.Value == playlist.Items[0]);
+ }
+
+ [Test]
+ public void TestSelectionNotLostAfterRearrangement()
+ {
+ createPlaylist(true, true);
+
+ moveToItem(0);
+ AddStep("click", () => InputManager.Click(MouseButton.Left));
+
+ moveToDragger(0);
+ AddStep("begin drag", () => InputManager.PressButton(MouseButton.Left));
+ moveToDragger(1, new Vector2(0, 5));
+ AddStep("end drag", () => InputManager.ReleaseButton(MouseButton.Left));
+
+ AddAssert("item 1 is selected", () => playlist.SelectedItem.Value == playlist.Items[1]);
+ }
+
+ [Test]
+ public void TestItemRemovedOnDeletion()
+ {
+ PlaylistItem selectedItem = null;
+
+ createPlaylist(true, true);
+
+ moveToItem(0);
+ AddStep("click", () => InputManager.Click(MouseButton.Left));
+ AddStep("retrieve selection", () => selectedItem = playlist.SelectedItem.Value);
+
+ moveToDeleteButton(0);
+ AddStep("click delete button", () => InputManager.Click(MouseButton.Left));
+
+ AddAssert("item removed", () => !playlist.Items.Contains(selectedItem));
+ }
+
+ [Test]
+ public void TestNextItemSelectedAfterDeletion()
+ {
+ createPlaylist(true, true);
+
+ moveToItem(0);
+ AddStep("click", () => InputManager.Click(MouseButton.Left));
+
+ moveToDeleteButton(0);
+ AddStep("click delete button", () => InputManager.Click(MouseButton.Left));
+
+ AddAssert("item 0 is selected", () => playlist.SelectedItem.Value == playlist.Items[0]);
+ }
+
+ [Test]
+ public void TestLastItemSelectedAfterLastItemDeleted()
+ {
+ createPlaylist(true, true);
+
+ AddWaitStep("wait for flow", 5); // Items may take 1 update frame to flow. A wait count of 5 is guaranteed to result in the flow being updated as desired.
+ AddStep("scroll to bottom", () => playlist.ChildrenOfType<ScrollContainer<Drawable>>().First().ScrollToEnd(false));
+
+ moveToItem(19);
+ AddStep("click", () => InputManager.Click(MouseButton.Left));
+
+ moveToDeleteButton(19);
+ AddStep("click delete button", () => InputManager.Click(MouseButton.Left));
+
+ AddAssert("item 18 is selected", () => playlist.SelectedItem.Value == playlist.Items[18]);
+ }
+
+ [Test]
+ public void TestSelectionResetWhenAllItemsDeleted()
+ {
+ createPlaylist(true, true);
+
+ AddStep("remove all but one item", () =>
+ {
+ playlist.Items.RemoveRange(1, playlist.Items.Count - 1);
+ });
+
+ moveToItem(0);
+ AddStep("click", () => InputManager.Click(MouseButton.Left));
+ moveToDeleteButton(0);
+ AddStep("click delete button", () => InputManager.Click(MouseButton.Left));
+
+ AddAssert("no item selected", () => playlist.SelectedItem.Value == null);
+ }
+
+ // Todo: currently not possible due to bindable list shortcomings (https://github.com/ppy/osu-framework/issues/3081)
+ // [Test]
+ public void TestNextItemSelectedAfterExternalDeletion()
+ {
+ createPlaylist(true, true);
+
+ moveToItem(0);
+ AddStep("click", () => InputManager.Click(MouseButton.Left));
+ AddStep("remove item 0", () => playlist.Items.RemoveAt(0));
+
+ AddAssert("item 0 is selected", () => playlist.SelectedItem.Value == playlist.Items[0]);
+ }
+
+ [Test]
+ public void TestChangeBeatmapAndRemove()
+ {
+ createPlaylist(true, true);
+
+ AddStep("change beatmap of first item", () => playlist.Items[0].BeatmapID = 30);
+ moveToDeleteButton(0);
+ AddStep("click delete button", () => InputManager.Click(MouseButton.Left));
+ }
+
+ private void moveToItem(int index, Vector2? offset = null)
+ => AddStep($"move mouse to item {index}", () => InputManager.MoveMouseTo(playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>>().ElementAt(index), offset));
+
+ private void moveToDragger(int index, Vector2? offset = null) => AddStep($"move mouse to dragger {index}", () =>
+ {
+ var item = playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>>().ElementAt(index);
+ InputManager.MoveMouseTo(item.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>.PlaylistItemHandle>().Single(), offset);
+ });
+
+ private void moveToDeleteButton(int index, Vector2? offset = null) => AddStep($"move mouse to delete button {index}", () =>
+ {
+ var item = playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>>().ElementAt(index);
+ InputManager.MoveMouseTo(item.ChildrenOfType<IconButton>().ElementAt(0), offset);
+ });
+
+ private void assertHandleVisibility(int index, bool visible)
+ => AddAssert($"handle {index} {(visible ? "is" : "is not")} visible",
+ () => (playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>.PlaylistItemHandle>().ElementAt(index).Alpha > 0) == visible);
+
+ private void assertDeleteButtonVisibility(int index, bool visible)
+ => AddAssert($"delete button {index} {(visible ? "is" : "is not")} visible", () => (playlist.ChildrenOfType<IconButton>().ElementAt(2 + index * 2).Alpha > 0) == visible);
+
+ private void createPlaylist(bool allowEdit, bool allowSelection)
+ {
+ AddStep("create playlist", () =>
+ {
+ Child = playlist = new TestPlaylist(allowEdit, allowSelection)
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ Size = new Vector2(500, 300)
+ };
+
+ for (int i = 0; i < 20; i++)
+ {
+ playlist.Items.Add(new PlaylistItem
+ {
+ ID = i,
+ Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+ Ruleset = { Value = new OsuRuleset().RulesetInfo },
+ RequiredMods =
+ {
+ new OsuModHardRock(),
+ new OsuModDoubleTime(),
+ new OsuModAutoplay()
+ }
+ });
+ }
+ });
+
+ AddUntilStep("wait for items to load", () => playlist.ItemMap.Values.All(i => i.IsLoaded));
+ }
+
+ private class TestPlaylist : DrawableRoomPlaylist
+ {
+ public new IReadOnlyDictionary<PlaylistItem, RearrangeableListItem<PlaylistItem>> ItemMap => base.ItemMap;
+
+ public TestPlaylist(bool allowEdit, bool allowSelection)
+ : base(allowEdit, allowSelection)
+ {
+ }
+ }
+ }
+}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
new file mode 100644
index 0000000000..1e1bc9725c
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
@@ -0,0 +1,59 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Multiplayer.RoomStatuses;
+using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+ public class TestSceneLoungeRoomInfo : MultiplayerTestScene
+ {
+ public override IReadOnlyList<Type> RequiredTypes => new[]
+ {
+ typeof(RoomInfo)
+ };
+
+ [SetUp]
+ public void Setup() => Schedule(() =>
+ {
+ Room.CopyFrom(new Room());
+
+ Child = new RoomInfo
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ Width = 500
+ };
+ });
+
+ public override void SetUpSteps()
+ {
+ // Todo: Temp
+ }
+
+ [Test]
+ public void TestNonSelectedRoom()
+ {
+ AddStep("set null room", () => Room.RoomID.Value = null);
+ }
+
+ [Test]
+ public void TestOpenRoom()
+ {
+ AddStep("set open room", () =>
+ {
+ Room.RoomID.Value = 0;
+ Room.Name.Value = "Room 0";
+ Room.Host.Value = new User { Username = "peppy", Id = 2 };
+ Room.EndDate.Value = DateTimeOffset.Now.AddMonths(1);
+ Room.Status.Value = new RoomStatusOpen();
+ });
+ }
+ }
+}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
new file mode 100644
index 0000000000..24d9f5ab12
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
@@ -0,0 +1,56 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Screens.Multi.Components;
+using osu.Game.Tests.Beatmaps;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+ public class TestSceneMatchBeatmapDetailArea : MultiplayerTestScene
+ {
+ [Resolved]
+ private BeatmapManager beatmapManager { get; set; }
+
+ [Resolved]
+ private RulesetStore rulesetStore { get; set; }
+
+ [SetUp]
+ public void Setup() => Schedule(() =>
+ {
+ Room.Playlist.Clear();
+
+ Child = new MatchBeatmapDetailArea
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ Size = new Vector2(500),
+ CreateNewItem = createNewItem
+ };
+ });
+
+ private void createNewItem()
+ {
+ Room.Playlist.Add(new PlaylistItem
+ {
+ ID = Room.Playlist.Count,
+ Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+ Ruleset = { Value = new OsuRuleset().RulesetInfo },
+ RequiredMods =
+ {
+ new OsuModHardRock(),
+ new OsuModDoubleTime(),
+ new OsuModAutoplay()
+ }
+ });
+ }
+ }
+}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapPanel.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapPanel.cs
deleted file mode 100644
index f014b08325..0000000000
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapPanel.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using System.Collections.Generic;
-using osu.Game.Beatmaps;
-using osu.Game.Online.Multiplayer;
-using osu.Game.Screens.Multi.Match.Components;
-using osu.Framework.Graphics;
-using osu.Game.Audio;
-using osu.Framework.Allocation;
-
-namespace osu.Game.Tests.Visual.Multiplayer
-{
- [Cached(typeof(IPreviewTrackOwner))]
- public class TestSceneMatchBeatmapPanel : MultiplayerTestScene, IPreviewTrackOwner
- {
- public override IReadOnlyList<Type> RequiredTypes => new[]
- {
- typeof(MatchBeatmapPanel)
- };
-
- [Resolved]
- private PreviewTrackManager previewTrackManager { get; set; }
-
- public TestSceneMatchBeatmapPanel()
- {
- Add(new MatchBeatmapPanel
- {
- Anchor = Anchor.Centre,
- Origin = Anchor.Centre,
- });
-
- Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = new BeatmapInfo { OnlineBeatmapID = 1763072 } } });
- Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = new BeatmapInfo { OnlineBeatmapID = 2101557 } } });
- Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = new BeatmapInfo { OnlineBeatmapID = 1973466 } } });
- Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = new BeatmapInfo { OnlineBeatmapID = 2109801 } } });
- Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = new BeatmapInfo { OnlineBeatmapID = 1922035 } } });
- }
- }
-}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
index 7d7e7f85db..cf40995fc0 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
@@ -5,10 +5,10 @@ using System;
using System.Collections.Generic;
using osu.Game.Beatmaps;
using osu.Game.Online.Multiplayer;
-using osu.Game.Online.Multiplayer.GameTypes;
using osu.Game.Rulesets.Osu;
using osu.Game.Rulesets.Osu.Mods;
using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Users;
namespace osu.Game.Tests.Visual.Multiplayer
{
@@ -45,7 +45,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
}
});
- Room.Type.Value = new GameTypeTimeshift();
+ Room.Name.Value = "A very awesome room";
+ Room.Host.Value = new User { Id = 2, Username = "peppy" };
Child = new Header();
}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHostInfo.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHostInfo.cs
deleted file mode 100644
index 808a45cdf0..0000000000
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHostInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using System.Collections.Generic;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Game.Screens.Multi.Match.Components;
-using osu.Game.Users;
-
-namespace osu.Game.Tests.Visual.Multiplayer
-{
- public class TestSceneMatchHostInfo : OsuTestScene
- {
- public override IReadOnlyList<Type> RequiredTypes => new[]
- {
- typeof(HostInfo)
- };
-
- private readonly Bindable<User> host = new Bindable<User>(new User { Username = "SomeHost" });
-
- public TestSceneMatchHostInfo()
- {
- HostInfo hostInfo;
-
- Child = hostInfo = new HostInfo
- {
- Anchor = Anchor.Centre,
- Origin = Anchor.Centre
- };
-
- hostInfo.Host.BindTo(host);
- }
- }
-}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchInfo.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchInfo.cs
deleted file mode 100644
index 6ee9ceb2dd..0000000000
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchInfo.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using System.Collections.Generic;
-using NUnit.Framework;
-using osu.Framework.Allocation;
-using osu.Game.Beatmaps;
-using osu.Game.Online.Multiplayer;
-using osu.Game.Online.Multiplayer.RoomStatuses;
-using osu.Game.Rulesets;
-using osu.Game.Screens.Multi.Match.Components;
-
-namespace osu.Game.Tests.Visual.Multiplayer
-{
- [TestFixture]
- public class TestSceneMatchInfo : MultiplayerTestScene
- {
- public override IReadOnlyList<Type> RequiredTypes => new[]
- {
- typeof(Info),
- typeof(HeaderButton),
- typeof(ReadyButton),
- typeof(MatchBeatmapPanel)
- };
-
- [BackgroundDependencyLoader]
- private void load(RulesetStore rulesets)
- {
- Add(new Info());
-
- AddStep(@"set name", () => Room.Name.Value = @"Room Name?");
- AddStep(@"set availability", () => Room.Availability.Value = RoomAvailability.FriendsOnly);
- AddStep(@"set status", () => Room.Status.Value = new RoomStatusPlaying());
- AddStep(@"set beatmap", () =>
- {
- Room.Playlist.Clear();
- Room.Playlist.Add(new PlaylistItem
- {
- Beatmap =
- {
- Value = new BeatmapInfo
- {
- StarDifficulty = 2.4,
- Ruleset = rulesets.GetRuleset(0),
- Metadata = new BeatmapMetadata
- {
- Title = @"My Song",
- Artist = @"VisualTests",
- AuthorString = @"osu!lazer",
- },
- }
- }
- });
- });
-
- AddStep(@"change name", () => Room.Name.Value = @"Room Name!");
- AddStep(@"change availability", () => Room.Availability.Value = RoomAvailability.InviteOnly);
- AddStep(@"change status", () => Room.Status.Value = new RoomStatusOpen());
- AddStep(@"null beatmap", () => Room.Playlist.Clear());
- AddStep(@"change beatmap", () =>
- {
- Room.Playlist.Clear();
- Room.Playlist.Add(new PlaylistItem
- {
- Beatmap =
- {
- Value = new BeatmapInfo
- {
- StarDifficulty = 4.2,
- Ruleset = rulesets.GetRuleset(3),
- Metadata = new BeatmapMetadata
- {
- Title = @"Your Song",
- Artist = @"Tester",
- AuthorString = @"Someone",
- },
- }
- }
- });
- });
- }
- }
-}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboardChatDisplay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboardChatDisplay.cs
new file mode 100644
index 0000000000..e46386b263
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboardChatDisplay.cs
@@ -0,0 +1,39 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Screens.Multi.Match.Components;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+ public class TestSceneMatchLeaderboardChatDisplay : MultiplayerTestScene
+ {
+ public override IReadOnlyList<Type> RequiredTypes => new[]
+ {
+ typeof(LeaderboardChatDisplay)
+ };
+
+ protected override bool UseOnlineAPI => true;
+
+ public TestSceneMatchLeaderboardChatDisplay()
+ {
+ Room.RoomID.Value = 7;
+
+ Add(new Container
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ Size = new Vector2(500),
+ Child = new LeaderboardChatDisplay
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ }
+ });
+ }
+ }
+}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchParticipants.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchParticipants.cs
deleted file mode 100644
index a6f47961e9..0000000000
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchParticipants.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using NUnit.Framework;
-using osu.Framework.Graphics;
-using osu.Game.Screens.Multi.Match.Components;
-using osu.Game.Users;
-
-namespace osu.Game.Tests.Visual.Multiplayer
-{
- [TestFixture]
- public class TestSceneMatchParticipants : MultiplayerTestScene
- {
- public TestSceneMatchParticipants()
- {
- Add(new Participants { RelativeSizeAxes = Axes.Both });
-
- AddStep(@"set max to null", () => Room.MaxParticipants.Value = null);
- AddStep(@"set users", () => Room.Participants.AddRange(new[]
- {
- new User
- {
- Username = @"Feppla",
- Id = 4271601,
- Country = new Country { FlagName = @"SE" },
- CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c2.jpg",
- IsSupporter = true,
- },
- new User
- {
- Username = @"Xilver",
- Id = 3099689,
- Country = new Country { FlagName = @"IL" },
- CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c2.jpg",
- IsSupporter = true,
- },
- new User
- {
- Username = @"Wucki",
- Id = 5287410,
- Country = new Country { FlagName = @"FI" },
- CoverUrl = @"https://assets.ppy.sh/user-profile-covers/5287410/5cfeaa9dd41cbce038ecdc9d781396ed4b0108089170bf7f50492ef8eadeb368.jpeg",
- IsSupporter = true,
- },
- }));
-
- AddStep(@"set max", () => Room.MaxParticipants.Value = 10);
- AddStep(@"clear users", () => Room.Participants.Clear());
- AddStep(@"set max to null", () => Room.MaxParticipants.Value = null);
- }
- }
-}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
new file mode 100644
index 0000000000..2c6f34d8a6
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
@@ -0,0 +1,158 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. 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.Linq;
+using System.Text;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Extensions;
+using osu.Framework.Platform;
+using osu.Framework.Screens;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.Select;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+ public class TestSceneMatchSongSelect : MultiplayerTestScene
+ {
+ public override IReadOnlyList<Type> RequiredTypes => new[]
+ {
+ typeof(MatchSongSelect),
+ typeof(MatchBeatmapDetailArea),
+ };
+
+ [Resolved]
+ private BeatmapManager beatmapManager { get; set; }
+
+ private BeatmapManager manager;
+
+ private RulesetStore rulesets;
+
+ private TestMatchSongSelect songSelect;
+
+ [BackgroundDependencyLoader]
+ private void load(GameHost host, AudioManager audio)
+ {
+ Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
+ Dependencies.Cache(manager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
+
+ var beatmaps = new List<BeatmapInfo>();
+
+ for (int i = 0; i < 6; i++)
+ {
+ int beatmapId = 10 * 10 + i;
+
+ int length = RNG.Next(30000, 200000);
+ double bpm = RNG.NextSingle(80, 200);
+
+ beatmaps.Add(new BeatmapInfo
+ {
+ Ruleset = new OsuRuleset().RulesetInfo,
+ OnlineBeatmapID = beatmapId,
+ Path = "normal.osu",
+ Version = $"{beatmapId} (length {TimeSpan.FromMilliseconds(length):m\\:ss}, bpm {bpm:0.#})",
+ Length = length,
+ BPM = bpm,
+ BaseDifficulty = new BeatmapDifficulty
+ {
+ OverallDifficulty = 3.5f,
+ },
+ });
+ }
+
+ manager.Import(new BeatmapSetInfo
+ {
+ OnlineBeatmapSetID = 10,
+ Hash = new MemoryStream(Encoding.UTF8.GetBytes(Guid.NewGuid().ToString())).ComputeMD5Hash(),
+ Metadata = new BeatmapMetadata
+ {
+ // Create random metadata, then we can check if sorting works based on these
+ Artist = "Some Artist " + RNG.Next(0, 9),
+ Title = $"Some Song (set id 10), max bpm {beatmaps.Max(b => b.BPM):0.#})",
+ AuthorString = "Some Guy " + RNG.Next(0, 9),
+ },
+ Beatmaps = beatmaps,
+ DateAdded = DateTimeOffset.UtcNow,
+ }).Wait();
+ }
+
+ public override void SetUpSteps()
+ {
+ base.SetUpSteps();
+
+ AddStep("reset", () =>
+ {
+ Ruleset.Value = new OsuRuleset().RulesetInfo;
+ Beatmap.SetDefault();
+ });
+
+ AddStep("create song select", () => LoadScreen(songSelect = new TestMatchSongSelect()));
+ AddUntilStep("wait for present", () => songSelect.IsCurrentScreen());
+ }
+
+ [SetUp]
+ public void Setup() => Schedule(() =>
+ {
+ Room.Playlist.Clear();
+ });
+
+ [Test]
+ public void TestItemAddedIfEmptyOnStart()
+ {
+ AddStep("finalise selection", () => songSelect.FinaliseSelection());
+ AddAssert("playlist has 1 item", () => Room.Playlist.Count == 1);
+ }
+
+ [Test]
+ public void TestItemAddedWhenCreateNewItemClicked()
+ {
+ AddStep("create new item", () => songSelect.BeatmapDetails.CreateNewItem());
+ AddAssert("playlist has 1 item", () => Room.Playlist.Count == 1);
+ }
+
+ [Test]
+ public void TestItemNotAddedIfExistingOnStart()
+ {
+ AddStep("create new item", () => songSelect.BeatmapDetails.CreateNewItem());
+ AddStep("finalise selection", () => songSelect.FinaliseSelection());
+ AddAssert("playlist has 1 item", () => Room.Playlist.Count == 1);
+ }
+
+ [Test]
+ public void TestAddSameItemMultipleTimes()
+ {
+ AddStep("create new item", () => songSelect.BeatmapDetails.CreateNewItem());
+ AddStep("create new item", () => songSelect.BeatmapDetails.CreateNewItem());
+ AddAssert("playlist has 2 items", () => Room.Playlist.Count == 2);
+ }
+
+ [Test]
+ public void TestAddItemAfterRearrangement()
+ {
+ AddStep("create new item", () => songSelect.BeatmapDetails.CreateNewItem());
+ AddStep("create new item", () => songSelect.BeatmapDetails.CreateNewItem());
+ AddStep("rearrange", () =>
+ {
+ var item = Room.Playlist[0];
+ Room.Playlist.RemoveAt(0);
+ Room.Playlist.Add(item);
+ });
+
+ AddStep("create new item", () => songSelect.BeatmapDetails.CreateNewItem());
+ AddAssert("new item has id 2", () => Room.Playlist.Last().ID == 2);
+ }
+
+ private class TestMatchSongSelect : MatchSongSelect
+ {
+ public new MatchBeatmapDetailArea BeatmapDetails => (MatchBeatmapDetailArea)base.BeatmapDetails;
+ }
+ }
+}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
new file mode 100644
index 0000000000..7f79e306ad
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
@@ -0,0 +1,121 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. 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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Screens;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Multi;
+using osu.Game.Screens.Multi.Match;
+using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Tests.Beatmaps;
+using osu.Game.Users;
+using osuTK.Input;
+using Header = osu.Game.Screens.Multi.Match.Components.Header;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+ public class TestSceneMatchSubScreen : MultiplayerTestScene
+ {
+ protected override bool UseOnlineAPI => true;
+
+ public override IReadOnlyList<Type> RequiredTypes => new[]
+ {
+ typeof(Screens.Multi.Multiplayer),
+ typeof(MatchSubScreen),
+ typeof(Header),
+ typeof(Footer)
+ };
+
+ [Cached(typeof(IRoomManager))]
+ private readonly TestRoomManager roomManager = new TestRoomManager();
+
+ [Resolved]
+ private BeatmapManager beatmaps { get; set; }
+
+ [Resolved]
+ private RulesetStore rulesets { get; set; }
+
+ private TestMatchSubScreen match;
+
+ [SetUp]
+ public void Setup() => Schedule(() =>
+ {
+ Room.CopyFrom(new Room());
+ });
+
+ [SetUpSteps]
+ public void SetupSteps()
+ {
+ AddStep("load match", () => LoadScreen(match = new TestMatchSubScreen(Room)));
+ AddUntilStep("wait for load", () => match.IsCurrentScreen());
+ }
+
+ [Test]
+ public void TestPlaylistItemSelectedOnCreate()
+ {
+ AddStep("set room properties", () =>
+ {
+ Room.Name.Value = "my awesome room";
+ Room.Host.Value = new User { Id = 2, Username = "peppy" };
+ Room.Playlist.Add(new PlaylistItem
+ {
+ Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+ Ruleset = { Value = new OsuRuleset().RulesetInfo }
+ });
+ });
+
+ AddStep("move mouse to create button", () =>
+ {
+ var footer = match.ChildrenOfType<Footer>().Single();
+ InputManager.MoveMouseTo(footer.ChildrenOfType<OsuButton>().Single());
+ });
+
+ AddStep("click", () => InputManager.Click(MouseButton.Left));
+
+ AddAssert("first playlist item selected", () => match.SelectedItem.Value == Room.Playlist[0]);
+ }
+
+ private class TestMatchSubScreen : MatchSubScreen
+ {
+ public new Bindable<PlaylistItem> SelectedItem => base.SelectedItem;
+
+ public TestMatchSubScreen(Room room)
+ : base(room)
+ {
+ }
+ }
+
+ private class TestRoomManager : IRoomManager
+ {
+ public event Action RoomsUpdated
+ {
+ add => throw new NotImplementedException();
+ remove => throw new NotImplementedException();
+ }
+
+ public IBindableList<Room> Rooms { get; } = new BindableList<Room>();
+
+ public void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
+ {
+ room.RoomID.Value = 1;
+ onSuccess?.Invoke(room);
+ }
+
+ public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => onSuccess?.Invoke(room);
+
+ public void PartRoom()
+ {
+ }
+ }
+ }
+}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
new file mode 100644
index 0000000000..1fc258a225
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
@@ -0,0 +1,58 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Game.Screens.Multi.Components;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+ public class TestSceneOverlinedParticipants : MultiplayerTestScene
+ {
+ public override IReadOnlyList<Type> RequiredTypes => new[]
+ {
+ typeof(OverlinedParticipants),
+ typeof(OverlinedDisplay),
+ typeof(ParticipantsList)
+ };
+
+ protected override bool UseOnlineAPI => true;
+
+ public TestSceneOverlinedParticipants()
+ {
+ Room.RoomID.Value = 7;
+ }
+
+ [Test]
+ public void TestHorizontalLayout()
+ {
+ AddStep("create component", () =>
+ {
+ Child = new OverlinedParticipants(Direction.Horizontal)
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ Width = 500,
+ AutoSizeAxes = Axes.Y,
+ };
+ });
+ }
+
+ [Test]
+ public void TestVerticalLayout()
+ {
+ AddStep("create component", () =>
+ {
+ Child = new OverlinedParticipants(Direction.Vertical)
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ Size = new Vector2(500)
+ };
+ });
+ }
+ }
+}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
new file mode 100644
index 0000000000..14b7934dc7
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
@@ -0,0 +1,37 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Multi.Components;
+using osu.Game.Tests.Beatmaps;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+ public class TestSceneOverlinedPlaylist : MultiplayerTestScene
+ {
+ protected override bool UseOnlineAPI => true;
+
+ public TestSceneOverlinedPlaylist()
+ {
+ for (int i = 0; i < 10; i++)
+ {
+ Room.Playlist.Add(new PlaylistItem
+ {
+ ID = i,
+ Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+ Ruleset = { Value = new OsuRuleset().RulesetInfo }
+ });
+ }
+
+ Add(new OverlinedPlaylist(false)
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ Size = new Vector2(500),
+ });
+ }
+ }
+}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
new file mode 100644
index 0000000000..9c4c45f94a
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
@@ -0,0 +1,20 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Game.Screens.Multi.Components;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+ public class TestSceneParticipantsList : MultiplayerTestScene
+ {
+ protected override bool UseOnlineAPI => true;
+
+ public TestSceneParticipantsList()
+ {
+ Room.RoomID.Value = 7;
+
+ Add(new ParticipantsList { RelativeSizeAxes = Axes.Both });
+ }
+ }
+}
diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index 8d2e4a614d..70d71d0952 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -117,6 +117,8 @@ namespace osu.Game.Tests.Visual.Navigation
{
base.LoadComplete();
API.Login("Rhythm Champion", "osu!");
+
+ Dependencies.Get<SessionStatics>().Set(Static.MutedAudioNotificationShownOnce, true);
}
}
diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
new file mode 100644
index 0000000000..7c05d99c59
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
@@ -0,0 +1,39 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using osu.Game.Overlays;
+using NUnit.Framework;
+
+namespace osu.Game.Tests.Visual.Online
+{
+ public class TestSceneBeatmapListingOverlay : OsuTestScene
+ {
+ public override IReadOnlyList<Type> RequiredTypes => new[]
+ {
+ typeof(BeatmapListingOverlay),
+ };
+
+ protected override bool UseOnlineAPI => true;
+
+ private readonly BeatmapListingOverlay overlay;
+
+ public TestSceneBeatmapListingOverlay()
+ {
+ Add(overlay = new BeatmapListingOverlay());
+ }
+
+ [Test]
+ public void TestShow()
+ {
+ AddStep("Show", overlay.Show);
+ }
+
+ [Test]
+ public void TestHide()
+ {
+ AddStep("Hide", overlay.Hide);
+ }
+ }
+}
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index 2a43ba3f99..ece280659c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual.Online
typeof(CommentsHeader),
typeof(DrawableComment),
typeof(HeaderButton),
- typeof(SortTabControl),
+ typeof(OverlaySortTabControl<>),
typeof(ShowChildrenButton),
typeof(DeletedCommentsCounter),
typeof(VotePill),
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsHeader.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsHeader.cs
index a60f220e4b..c688d600a3 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsHeader.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsHeader.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Tests.Visual.Online
{
typeof(CommentsHeader),
typeof(HeaderButton),
- typeof(SortTabControl),
+ typeof(OverlaySortTabControl<>),
};
[Cached]
diff --git a/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs
index e0e5a088ce..7327e80d06 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs
@@ -4,6 +4,8 @@
using osu.Game.Overlays.BeatmapSet;
using System;
using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
using osu.Framework.Graphics;
using osu.Game.Rulesets.Osu;
using osu.Game.Rulesets.Mania;
@@ -15,6 +17,7 @@ using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Bindables;
using osu.Game.Graphics.Sprites;
using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
namespace osu.Game.Tests.Visual.Online
{
@@ -44,27 +47,31 @@ namespace osu.Game.Tests.Visual.Online
Ruleset = { BindTarget = ruleset }
});
- modSelector.SelectedMods.ItemsAdded += mods =>
+ modSelector.SelectedMods.CollectionChanged += (_, args) =>
{
- mods.ForEach(mod => selectedMods.Add(new OsuSpriteText
+ switch (args.Action)
{
- Text = mod.Acronym,
- }));
- };
-
- modSelector.SelectedMods.ItemsRemoved += mods =>
- {
- mods.ForEach(mod =>
- {
- foreach (var selected in selectedMods)
- {
- if (selected.Text == mod.Acronym)
+ case NotifyCollectionChangedAction.Add:
+ args.NewItems.Cast<Mod>().ForEach(mod => selectedMods.Add(new OsuSpriteText
{
- selectedMods.Remove(selected);
- break;
- }
- }
- });
+ Text = mod.Acronym,
+ }));
+ break;
+
+ case NotifyCollectionChangedAction.Remove:
+ args.OldItems.Cast<Mod>().ForEach(mod =>
+ {
+ foreach (var selected in selectedMods)
+ {
+ if (selected.Text == mod.Acronym)
+ {
+ selectedMods.Remove(selected);
+ break;
+ }
+ }
+ });
+ break;
+ }
};
AddStep("osu ruleset", () => ruleset.Value = new OsuRuleset().RulesetInfo);
diff --git a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
new file mode 100644
index 0000000000..3c2735ca56
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
@@ -0,0 +1,97 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online;
+using osu.Game.Online.API;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.Online
+{
+ [TestFixture]
+ public class TestSceneOnlineViewContainer : OsuTestScene
+ {
+ private readonly TestOnlineViewContainer onlineView;
+
+ public TestSceneOnlineViewContainer()
+ {
+ Child = new Container
+ {
+ RelativeSizeAxes = Axes.Both,
+ Child = onlineView = new TestOnlineViewContainer()
+ };
+ }
+
+ [Test]
+ public void TestOnlineStateVisibility()
+ {
+ AddStep("set status to online", () => ((DummyAPIAccess)API).State = APIState.Online);
+
+ AddUntilStep("children are visible", () => onlineView.ViewTarget.IsPresent);
+ AddUntilStep("loading animation is not visible", () => !onlineView.LoadingAnimation.IsPresent);
+ }
+
+ [Test]
+ public void TestOfflineStateVisibility()
+ {
+ AddStep("set status to offline", () => ((DummyAPIAccess)API).State = APIState.Offline);
+
+ AddUntilStep("children are not visible", () => !onlineView.ViewTarget.IsPresent);
+ AddUntilStep("loading animation is not visible", () => !onlineView.LoadingAnimation.IsPresent);
+ }
+
+ [Test]
+ public void TestConnectingStateVisibility()
+ {
+ AddStep("set status to connecting", () => ((DummyAPIAccess)API).State = APIState.Connecting);
+
+ AddUntilStep("children are not visible", () => !onlineView.ViewTarget.IsPresent);
+ AddUntilStep("loading animation is visible", () => onlineView.LoadingAnimation.IsPresent);
+ }
+
+ [Test]
+ public void TestFailingStateVisibility()
+ {
+ AddStep("set status to failing", () => ((DummyAPIAccess)API).State = APIState.Failing);
+
+ AddUntilStep("children are not visible", () => !onlineView.ViewTarget.IsPresent);
+ AddUntilStep("loading animation is visible", () => onlineView.LoadingAnimation.IsPresent);
+ }
+
+ private class TestOnlineViewContainer : OnlineViewContainer
+ {
+ public new LoadingAnimation LoadingAnimation => base.LoadingAnimation;
+
+ public CompositeDrawable ViewTarget => base.Content;
+
+ public TestOnlineViewContainer()
+ : base(@"Please sign in to view dummy test content")
+ {
+ RelativeSizeAxes = Axes.Both;
+
+ Children = new Drawable[]
+ {
+ new Box
+ {
+ RelativeSizeAxes = Axes.Both,
+ Colour = Color4.Blue.Opacity(0.8f),
+ },
+ new OsuSpriteText
+ {
+ Text = "dummy online content",
+ Font = OsuFont.Default.With(size: 40),
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ }
+ };
+ }
+ }
+ }
+}
diff --git a/osu.Game.Tests/Visual/Online/TestSceneProfileCounterPill.cs b/osu.Game.Tests/Visual/Online/TestSceneProfileCounterPill.cs
index 468239cf08..5e2b125521 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneProfileCounterPill.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneProfileCounterPill.cs
@@ -4,8 +4,10 @@
using System;
using System.Collections.Generic;
using NUnit.Framework;
+using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
+using osu.Game.Overlays;
using osu.Game.Overlays.Profile.Sections;
namespace osu.Game.Tests.Visual.Online
@@ -17,6 +19,9 @@ namespace osu.Game.Tests.Visual.Online
typeof(CounterPill)
};
+ [Cached]
+ private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Red);
+
private readonly CounterPill pill;
private readonly BindableInt value = new BindableInt();
diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
index a769ebe4a9..83e5cd0fe7 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
@@ -29,8 +29,8 @@ namespace osu.Game.Tests.Visual.Online
typeof(RankingsOverlayHeader)
};
- [Cached]
- private RankingsOverlay rankingsOverlay;
+ [Cached(typeof(RankingsOverlay))]
+ private readonly RankingsOverlay rankingsOverlay;
private readonly Bindable<Country> countryBindable = new Bindable<Country>();
private readonly Bindable<RankingsScope> scope = new Bindable<RankingsScope>();
diff --git a/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
index 3c959e05c1..51f4089058 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
@@ -195,6 +195,29 @@ namespace osu.Game.Tests.Visual.Online
Position = 1337,
};
+ var myBestScoreWithNullPosition = new APILegacyUserTopScoreInfo
+ {
+ Score = new APILegacyScoreInfo
+ {
+ User = new User
+ {
+ Id = 7151382,
+ Username = @"Mayuri Hana",
+ Country = new Country
+ {
+ FullName = @"Thailand",
+ FlagName = @"TH",
+ },
+ },
+ Rank = ScoreRank.D,
+ PP = 160,
+ MaxCombo = 1234,
+ TotalScore = 123456,
+ Accuracy = 0.6543,
+ },
+ Position = null,
+ };
+
var oneScore = new APILegacyScores
{
Scores = new List<APILegacyScoreInfo>
@@ -250,6 +273,12 @@ namespace osu.Game.Tests.Visual.Online
allScores.UserScore = myBestScore;
scoresContainer.Scores = allScores;
});
+
+ AddStep("Load scores with null my best position", () =>
+ {
+ allScores.UserScore = myBestScoreWithNullPosition;
+ scoresContainer.Scores = allScores;
+ });
}
private class TestScoresContainer : ScoresContainer
diff --git a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
index 28b5693ef4..492abdd88d 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
@@ -128,17 +128,17 @@ namespace osu.Game.Tests.Visual.Online
const int messages_per_call = 10;
AddRepeatStep("add many messages", () =>
+ {
+ for (int i = 0; i < messages_per_call; i++)
{
- for (int i = 0; i < messages_per_call; i++)
+ testChannel.AddNewMessages(new Message(sequence++)
{
- testChannel.AddNewMessages(new Message(sequence++)
- {
- Sender = longUsernameUser,
- Content = "Many messages! " + Guid.NewGuid(),
- Timestamp = DateTimeOffset.Now
- });
- }
- }, Channel.MAX_HISTORY / messages_per_call + 5);
+ Sender = longUsernameUser,
+ Content = "Many messages! " + Guid.NewGuid(),
+ Timestamp = DateTimeOffset.Now
+ });
+ }
+ }, Channel.MAX_HISTORY / messages_per_call + 5);
AddAssert("Ensure no adjacent day separators", () =>
{
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
index 19b72e7071..f1e745bd14 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
@@ -28,7 +28,30 @@ namespace osu.Game.Tests.Visual.Online
public TestSceneUserProfileScores()
{
- var score = new ScoreInfo
+ var firstScore = new ScoreInfo
+ {
+ PP = 1047.21,
+ Rank = ScoreRank.SH,
+ Beatmap = new BeatmapInfo
+ {
+ Metadata = new BeatmapMetadata
+ {
+ Title = "JUSTadICE (TV Size)",
+ Artist = "Oomori Seiko"
+ },
+ Version = "Extreme"
+ },
+ Date = DateTimeOffset.Now,
+ Mods = new Mod[]
+ {
+ new OsuModHidden(),
+ new OsuModHardRock(),
+ new OsuModDoubleTime()
+ },
+ Accuracy = 0.9813
+ };
+
+ var secondScore = new ScoreInfo
{
PP = 134.32,
Rank = ScoreRank.A,
@@ -50,6 +73,23 @@ namespace osu.Game.Tests.Visual.Online
Accuracy = 0.998546
};
+ var thirdScore = new ScoreInfo
+ {
+ PP = 96.83,
+ Rank = ScoreRank.S,
+ Beatmap = new BeatmapInfo
+ {
+ Metadata = new BeatmapMetadata
+ {
+ Title = "Idolize",
+ Artist = "Creo"
+ },
+ Version = "Insane"
+ },
+ Date = DateTimeOffset.Now,
+ Accuracy = 0.9726
+ };
+
var noPPScore = new ScoreInfo
{
Rank = ScoreRank.B,
@@ -76,9 +116,12 @@ namespace osu.Game.Tests.Visual.Online
Spacing = new Vector2(0, 10),
Children = new[]
{
- new ColourProvidedContainer(OverlayColourScheme.Green, new DrawableProfileScore(score)),
+ new ColourProvidedContainer(OverlayColourScheme.Green, new DrawableProfileScore(firstScore)),
+ new ColourProvidedContainer(OverlayColourScheme.Green, new DrawableProfileScore(secondScore)),
new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileScore(noPPScore)),
- new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileWeightedScore(score, 0.85))
+ new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileWeightedScore(firstScore, 0.97)),
+ new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileWeightedScore(secondScore, 0.85)),
+ new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileWeightedScore(thirdScore, 0.66)),
}
});
}
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
index 3eff75b020..1198488bda 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
@@ -59,6 +59,33 @@ namespace osu.Game.Tests.Visual.SongSelect
AddStep(@"None selected", () => leaderboard.SetRetrievalState(PlaceholderState.NoneSelected));
foreach (BeatmapSetOnlineStatus status in Enum.GetValues(typeof(BeatmapSetOnlineStatus)))
AddStep($"{status} beatmap", () => showBeatmapWithStatus(status));
+ AddStep("null personal best position", showPersonalBestWithNullPosition);
+ }
+
+ private void showPersonalBestWithNullPosition()
+ {
+ leaderboard.TopScore = new APILegacyUserTopScoreInfo
+ {
+ Position = null,
+ Score = new APILegacyScoreInfo
+ {
+ Rank = ScoreRank.XH,
+ Accuracy = 1,
+ MaxCombo = 244,
+ TotalScore = 1707827,
+ Mods = new[] { new OsuModHidden().Acronym, new OsuModHardRock().Acronym, },
+ User = new User
+ {
+ Id = 6602580,
+ Username = @"waaiiru",
+ Country = new Country
+ {
+ FullName = @"Spain",
+ FlagName = @"ES",
+ },
+ },
+ }
+ };
}
private void showPersonalBest()
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs
new file mode 100644
index 0000000000..1d8db71527
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs
@@ -0,0 +1,90 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays;
+using osu.Game.Overlays.BeatmapListing;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+ public class TestSceneBeatmapListingSearchSection : OsuTestScene
+ {
+ public override IReadOnlyList<Type> RequiredTypes => new[]
+ {
+ typeof(BeatmapListingSearchSection),
+ };
+
+ [Cached]
+ private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
+ private readonly BeatmapListingSearchSection section;
+
+ public TestSceneBeatmapListingSearchSection()
+ {
+ OsuSpriteText query;
+ OsuSpriteText ruleset;
+ OsuSpriteText category;
+
+ Add(section = new BeatmapListingSearchSection
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ });
+
+ Add(new FillFlowContainer
+ {
+ AutoSizeAxes = Axes.Both,
+ Direction = FillDirection.Vertical,
+ Spacing = new Vector2(0, 5),
+ Children = new Drawable[]
+ {
+ query = new OsuSpriteText(),
+ ruleset = new OsuSpriteText(),
+ category = new OsuSpriteText(),
+ }
+ });
+
+ section.Query.BindValueChanged(q => query.Text = $"Query: {q.NewValue}", true);
+ section.Ruleset.BindValueChanged(r => ruleset.Text = $"Ruleset: {r.NewValue}", true);
+ section.Category.BindValueChanged(c => category.Text = $"Category: {c.NewValue}", true);
+ }
+
+ [Test]
+ public void TestCovers()
+ {
+ AddStep("Set beatmap", () => section.BeatmapSet = beatmap_set);
+ AddStep("Set beatmap (no cover)", () => section.BeatmapSet = no_cover_beatmap_set);
+ AddStep("Set null beatmap", () => section.BeatmapSet = null);
+ }
+
+ private static readonly BeatmapSetInfo beatmap_set = new BeatmapSetInfo
+ {
+ OnlineInfo = new BeatmapSetOnlineInfo
+ {
+ Covers = new BeatmapSetOnlineCovers
+ {
+ Cover = "https://assets.ppy.sh/beatmaps/1094296/covers/cover@2x.jpg?1581416305"
+ }
+ }
+ };
+
+ private static readonly BeatmapSetInfo no_cover_beatmap_set = new BeatmapSetInfo
+ {
+ OnlineInfo = new BeatmapSetOnlineInfo
+ {
+ Covers = new BeatmapSetOnlineCovers
+ {
+ Cover = string.Empty
+ }
+ }
+ };
+ }
+}
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs
new file mode 100644
index 0000000000..a5fa085abf
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs
@@ -0,0 +1,55 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays;
+using osu.Game.Overlays.BeatmapListing;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+ public class TestSceneBeatmapListingSort : OsuTestScene
+ {
+ public override IReadOnlyList<Type> RequiredTypes => new[]
+ {
+ typeof(BeatmapListingSortTabControl),
+ typeof(OverlaySortTabControl<>),
+ };
+
+ [Cached]
+ private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
+ public TestSceneBeatmapListingSort()
+ {
+ BeatmapListingSortTabControl control;
+ OsuSpriteText current;
+ OsuSpriteText direction;
+
+ Add(control = new BeatmapListingSortTabControl
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ });
+
+ Add(new FillFlowContainer
+ {
+ AutoSizeAxes = Axes.Both,
+ Direction = FillDirection.Vertical,
+ Spacing = new Vector2(0, 5),
+ Children = new Drawable[]
+ {
+ current = new OsuSpriteText(),
+ direction = new OsuSpriteText()
+ }
+ });
+
+ control.SortDirection.BindValueChanged(sortDirection => direction.Text = $"Sort direction: {sortDirection.NewValue}", true);
+ control.Current.BindValueChanged(criteria => current.Text = $"Criteria: {criteria.NewValue}", true);
+ }
+ }
+}
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
new file mode 100644
index 0000000000..7b4424e568
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
@@ -0,0 +1,58 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Containers;
+using osu.Game.Online.API.Requests;
+using osu.Game.Overlays;
+using osu.Game.Overlays.BeatmapListing;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+ public class TestSceneBeatmapSearchFilter : OsuTestScene
+ {
+ public override IReadOnlyList<Type> RequiredTypes => new[]
+ {
+ typeof(BeatmapSearchFilterRow<>),
+ typeof(BeatmapSearchRulesetFilterRow),
+ typeof(BeatmapSearchSmallFilterRow<>),
+ };
+
+ [Cached]
+ private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
+ private readonly ReverseChildIDFillFlowContainer<Drawable> resizableContainer;
+
+ public TestSceneBeatmapSearchFilter()
+ {
+ Add(resizableContainer = new ReverseChildIDFillFlowContainer<Drawable>
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ AutoSizeAxes = Axes.Y,
+ RelativeSizeAxes = Axes.X,
+ Direction = FillDirection.Vertical,
+ Spacing = new Vector2(0, 10),
+ Children = new Drawable[]
+ {
+ new BeatmapSearchRulesetFilterRow(),
+ new BeatmapSearchFilterRow<BeatmapSearchCategory>("Categories"),
+ new BeatmapSearchSmallFilterRow<BeatmapSearchCategory>("Header Name")
+ }
+ });
+ }
+
+ [Test]
+ public void TestResize()
+ {
+ AddStep("Resize to 0.3", () => resizableContainer.ResizeWidthTo(0.3f, 1000));
+ AddStep("Resize to 1", () => resizableContainer.ResizeWidthTo(1, 1000));
+ }
+ }
+}
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneProcessingOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneProcessingOverlay.cs
new file mode 100644
index 0000000000..2424078e5a
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneProcessingOverlay.cs
@@ -0,0 +1,86 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+ public class TestSceneProcessingOverlay : OsuTestScene
+ {
+ private Drawable dimContent;
+ private ProcessingOverlay overlay;
+
+ [SetUp]
+ public void SetUp() => Schedule(() =>
+ {
+ Children = new[]
+ {
+ new Container
+ {
+ Size = new Vector2(300),
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ Children = new[]
+ {
+ new Box
+ {
+ Colour = Color4.SlateGray,
+ RelativeSizeAxes = Axes.Both,
+ },
+ dimContent = new FillFlowContainer
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ Direction = FillDirection.Vertical,
+ Spacing = new Vector2(10),
+ RelativeSizeAxes = Axes.Both,
+ Size = new Vector2(0.9f),
+ Children = new Drawable[]
+ {
+ new OsuSpriteText { Text = "Sample content" },
+ new TriangleButton { Text = "can't puush me", Width = 200, },
+ new TriangleButton { Text = "puush me", Width = 200, Action = () => { } },
+ }
+ },
+ overlay = new ProcessingOverlay(dimContent),
+ }
+ },
+ };
+ });
+
+ [Test]
+ public void ShowHide()
+ {
+ AddAssert("not visible", () => !overlay.IsPresent);
+
+ AddStep("show", () => overlay.Show());
+
+ AddUntilStep("wait for content dim", () => dimContent.Colour != Color4.White);
+
+ AddStep("hide", () => overlay.Hide());
+
+ AddUntilStep("wait for content restore", () => dimContent.Colour == Color4.White);
+ }
+
+ [Test]
+ public void ContentRestoreOnDispose()
+ {
+ AddAssert("not visible", () => !overlay.IsPresent);
+
+ AddStep("show", () => overlay.Show());
+
+ AddUntilStep("wait for content dim", () => dimContent.Colour != Color4.White);
+
+ AddStep("hide", () => overlay.Expire());
+
+ AddUntilStep("wait for content restore", () => dimContent.Colour == Color4.White);
+ }
+ }
+}
diff --git a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
index 32cf6bbcc8..5598910824 100644
--- a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
@@ -1,6 +1,8 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
+using System.Collections.Specialized;
+using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Extensions.IEnumerableExtensions;
@@ -71,8 +73,19 @@ namespace osu.Game.Tournament.Screens.Editors
}
});
- Storage.ItemsAdded += items => items.ForEach(i => flow.Add(CreateDrawable(i)));
- Storage.ItemsRemoved += items => items.ForEach(i => flow.RemoveAll(d => d.Model == i));
+ Storage.CollectionChanged += (_, args) =>
+ {
+ switch (args.Action)
+ {
+ case NotifyCollectionChangedAction.Add:
+ args.NewItems.Cast<TModel>().ForEach(i => flow.Add(CreateDrawable(i)));
+ break;
+
+ case NotifyCollectionChangedAction.Remove:
+ args.OldItems.Cast<TModel>().ForEach(i => flow.RemoveAll(d => d.Model == i));
+ break;
+ }
+ };
foreach (var model in Storage)
flow.Add(CreateDrawable(model));
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
index 0864d25a2f..8ab083ddaf 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
@@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
+using System.Collections.Specialized;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
@@ -90,8 +91,19 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
foreach (var r in rounds.Prepend(new TournamentRound()))
add(r);
- rounds.ItemsRemoved += items => items.ForEach(i => Control.RemoveDropdownItem(i));
- rounds.ItemsAdded += items => items.ForEach(add);
+ rounds.CollectionChanged += (_, args) =>
+ {
+ switch (args.Action)
+ {
+ case NotifyCollectionChangedAction.Add:
+ args.NewItems.Cast<TournamentRound>().ForEach(add);
+ break;
+
+ case NotifyCollectionChangedAction.Remove:
+ args.OldItems.Cast<TournamentRound>().ForEach(i => Control.RemoveDropdownItem(i));
+ break;
+ }
+ };
}
private readonly List<IUnbindable> refBindables = new List<IUnbindable>();
@@ -122,8 +134,19 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
foreach (var t in teams.Prepend(new TournamentTeam()))
add(t);
- teams.ItemsRemoved += items => items.ForEach(i => Control.RemoveDropdownItem(i));
- teams.ItemsAdded += items => items.ForEach(add);
+ teams.CollectionChanged += (_, args) =>
+ {
+ switch (args.Action)
+ {
+ case NotifyCollectionChangedAction.Add:
+ args.NewItems.Cast<TournamentTeam>().ForEach(add);
+ break;
+
+ case NotifyCollectionChangedAction.Remove:
+ args.OldItems.Cast<TournamentTeam>().ForEach(i => Control.RemoveDropdownItem(i));
+ break;
+ }
+ };
}
private readonly List<IUnbindable> refBindables = new List<IUnbindable>();
diff --git a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
index 66e68a0f37..8ea366e1b4 100644
--- a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
+++ b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
@@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
+using System.Collections.Specialized;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Caching;
@@ -68,22 +69,24 @@ namespace osu.Game.Tournament.Screens.Ladder
foreach (var match in LadderInfo.Matches)
addMatch(match);
- LadderInfo.Rounds.ItemsAdded += _ => layout.Invalidate();
- LadderInfo.Rounds.ItemsRemoved += _ => layout.Invalidate();
-
- LadderInfo.Matches.ItemsAdded += matches =>
+ LadderInfo.Rounds.CollectionChanged += (_, __) => layout.Invalidate();
+ LadderInfo.Matches.CollectionChanged += (_, args) =>
{
- foreach (var p in matches)
- addMatch(p);
- layout.Invalidate();
- };
-
- LadderInfo.Matches.ItemsRemoved += matches =>
- {
- foreach (var p in matches)
+ switch (args.Action)
{
- foreach (var d in MatchesContainer.Where(d => d.Match == p))
- d.Expire();
+ case NotifyCollectionChangedAction.Add:
+ foreach (var p in args.NewItems.Cast<TournamentMatch>())
+ addMatch(p);
+ break;
+
+ case NotifyCollectionChangedAction.Remove:
+ foreach (var p in args.NewItems.Cast<TournamentMatch>())
+ {
+ foreach (var d in MatchesContainer.Where(d => d.Match == p))
+ d.Expire();
+ }
+
+ break;
}
layout.Invalidate();
diff --git a/osu.Game/Audio/PreviewTrackManager.cs b/osu.Game/Audio/PreviewTrackManager.cs
index 6f0b62543d..862be41c1a 100644
--- a/osu.Game/Audio/PreviewTrackManager.cs
+++ b/osu.Game/Audio/PreviewTrackManager.cs
@@ -19,13 +19,15 @@ namespace osu.Game.Audio
{
private readonly BindableDouble muteBindable = new BindableDouble();
- private AudioManager audio;
+ [Resolved]
+ private AudioManager audio { get; set; }
+
private PreviewTrackStore trackStore;
protected TrackManagerPreviewTrack CurrentTrack;
[BackgroundDependencyLoader]
- private void load(AudioManager audio)
+ private void load()
{
// this is a temporary solution to get around muting ourselves.
// todo: update this once we have a BackgroundTrackManager or similar.
@@ -33,8 +35,6 @@ namespace osu.Game.Audio
audio.AddItem(trackStore);
trackStore.AddAdjustment(AdjustableProperty.Volume, audio.VolumeTrack);
-
- this.audio = audio;
}
/// <summary>
@@ -90,6 +90,7 @@ namespace osu.Game.Audio
public class TrackManagerPreviewTrack : PreviewTrack
{
+ [Resolved]
public IPreviewTrackOwner Owner { get; private set; }
private readonly BeatmapSetInfo beatmapSetInfo;
@@ -101,12 +102,6 @@ namespace osu.Game.Audio
this.trackManager = trackManager;
}
- [BackgroundDependencyLoader]
- private void load(IPreviewTrackOwner owner)
- {
- Owner = owner;
- }
-
protected override Track GetTrack() => trackManager.Get($"https://b.ppy.sh/preview/{beatmapSetInfo?.OnlineBeatmapSetID}.mp3");
}
diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index bcc9ab885e..68d113ce40 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -51,6 +51,9 @@ namespace osu.Game.Beatmaps
[NotMapped]
public BeatmapOnlineInfo OnlineInfo { get; set; }
+ [NotMapped]
+ public int? MaxCombo { get; set; }
+
/// <summary>
/// The playable length in milliseconds of this beatmap.
/// </summary>
diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index 55c5175c5d..1991770518 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -74,7 +74,9 @@ namespace osu.Game.Beatmaps
try
{
- return new VideoSprite(textureStore.GetStream(getPathForFile(Metadata.VideoFile)));
+ var stream = textureStore.GetStream(getPathForFile(Metadata.VideoFile));
+
+ return stream == null ? null : new VideoSprite(stream);
}
catch (Exception e)
{
diff --git a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
index a3128e36c4..8a0d981e49 100644
--- a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
+++ b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
@@ -150,12 +150,12 @@ namespace osu.Game.Beatmaps.Drawables
};
}
- private OsuColour colours;
+ [Resolved]
+ private OsuColour colours { get; set; }
[BackgroundDependencyLoader]
- private void load(OsuColour colours)
+ private void load()
{
- this.colours = colours;
background.Colour = colours.Gray3;
}
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 6ae3c7ac64..ce959e9057 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Configuration
Set(OsuSetting.Ruleset, 0, 0, int.MaxValue);
Set(OsuSetting.Skin, 0, -1, int.MaxValue);
- Set(OsuSetting.BeatmapDetailTab, BeatmapDetailTab.Details);
+ Set(OsuSetting.BeatmapDetailTab, PlayBeatmapDetailArea.TabType.Details);
Set(OsuSetting.ShowConvertedBeatmaps, true);
Set(OsuSetting.DisplayStarsMinimum, 0.0, 0, 10, 0.1);
diff --git a/osu.Game/Database/DownloadableArchiveModelManager.cs b/osu.Game/Database/DownloadableArchiveModelManager.cs
index 4bd9df5f36..1b90898c8d 100644
--- a/osu.Game/Database/DownloadableArchiveModelManager.cs
+++ b/osu.Game/Database/DownloadableArchiveModelManager.cs
@@ -105,9 +105,10 @@ namespace osu.Game.Database
void triggerFailure(Exception error)
{
+ currentDownloads.Remove(request);
+
DownloadFailed?.Invoke(request);
- currentDownloads.Remove(request);
notification.State = ProgressNotificationState.Cancelled;
if (!(error is OperationCanceledException))
diff --git a/osu.Game/Graphics/Containers/OsuRearrangeableListContainer.cs b/osu.Game/Graphics/Containers/OsuRearrangeableListContainer.cs
new file mode 100644
index 0000000000..47aed1c500
--- /dev/null
+++ b/osu.Game/Graphics/Containers/OsuRearrangeableListContainer.cs
@@ -0,0 +1,26 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Graphics.Containers
+{
+ public abstract class OsuRearrangeableListContainer<TModel> : RearrangeableListContainer<TModel>
+ {
+ /// <summary>
+ /// Whether any item is currently being dragged. Used to hide other items' drag handles.
+ /// </summary>
+ private readonly BindableBool playlistDragActive = new BindableBool();
+
+ protected override ScrollContainer<Drawable> CreateScrollContainer() => new OsuScrollContainer();
+
+ protected sealed override RearrangeableListItem<TModel> CreateDrawable(TModel item) => CreateOsuDrawable(item).With(d =>
+ {
+ d.PlaylistDragActive.BindTo(playlistDragActive);
+ });
+
+ protected abstract OsuRearrangeableListItem<TModel> CreateOsuDrawable(TModel item);
+ }
+}
diff --git a/osu.Game/Graphics/Containers/OsuRearrangeableListItem.cs b/osu.Game/Graphics/Containers/OsuRearrangeableListItem.cs
new file mode 100644
index 0000000000..29553954fe
--- /dev/null
+++ b/osu.Game/Graphics/Containers/OsuRearrangeableListItem.cs
@@ -0,0 +1,162 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Events;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Graphics.Containers
+{
+ public abstract class OsuRearrangeableListItem<TModel> : RearrangeableListItem<TModel>
+ {
+ public const float FADE_DURATION = 100;
+
+ /// <summary>
+ /// Whether any item is currently being dragged. Used to hide other items' drag handles.
+ /// </summary>
+ public readonly BindableBool PlaylistDragActive = new BindableBool();
+
+ private Color4 handleColour = Color4.White;
+
+ /// <summary>
+ /// The colour of the drag handle.
+ /// </summary>
+ protected Color4 HandleColour
+ {
+ get => handleColour;
+ set
+ {
+ if (handleColour == value)
+ return;
+
+ handleColour = value;
+
+ if (handle != null)
+ handle.Colour = value;
+ }
+ }
+
+ /// <summary>
+ /// Whether the drag handle should be shown.
+ /// </summary>
+ protected virtual bool ShowDragHandle => true;
+
+ private PlaylistItemHandle handle;
+
+ protected OsuRearrangeableListItem(TModel item)
+ : base(item)
+ {
+ RelativeSizeAxes = Axes.X;
+ AutoSizeAxes = Axes.Y;
+ }
+
+ [BackgroundDependencyLoader]
+ private void load()
+ {
+ Container handleContainer;
+
+ InternalChild = new GridContainer
+ {
+ RelativeSizeAxes = Axes.X,
+ AutoSizeAxes = Axes.Y,
+ Content = new[]
+ {
+ new[]
+ {
+ handleContainer = new Container
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ AutoSizeAxes = Axes.Both,
+ Padding = new MarginPadding { Horizontal = 5 },
+ Child = handle = new PlaylistItemHandle
+ {
+ Size = new Vector2(12),
+ Colour = HandleColour,
+ AlwaysPresent = true,
+ Alpha = 0
+ }
+ },
+ CreateContent()
+ }
+ },
+ ColumnDimensions = new[] { new Dimension(GridSizeMode.AutoSize) },
+ RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
+ };
+
+ if (!ShowDragHandle)
+ handleContainer.Alpha = 0;
+ }
+
+ protected override bool OnDragStart(DragStartEvent e)
+ {
+ if (!base.OnDragStart(e))
+ return false;
+
+ PlaylistDragActive.Value = true;
+ return true;
+ }
+
+ protected override void OnDragEnd(DragEndEvent e)
+ {
+ PlaylistDragActive.Value = false;
+ base.OnDragEnd(e);
+ }
+
+ protected override bool IsDraggableAt(Vector2 screenSpacePos) => handle.HandlingDrag;
+
+ protected override bool OnHover(HoverEvent e)
+ {
+ handle.UpdateHoverState(IsDragged || !PlaylistDragActive.Value);
+ return base.OnHover(e);
+ }
+
+ protected override void OnHoverLost(HoverLostEvent e) => handle.UpdateHoverState(false);
+
+ protected abstract Drawable CreateContent();
+
+ public class PlaylistItemHandle : SpriteIcon
+ {
+ public bool HandlingDrag { get; private set; }
+ private bool isHovering;
+
+ public PlaylistItemHandle()
+ {
+ Icon = FontAwesome.Solid.Bars;
+ }
+
+ protected override bool OnMouseDown(MouseDownEvent e)
+ {
+ base.OnMouseDown(e);
+
+ HandlingDrag = true;
+ UpdateHoverState(isHovering);
+
+ return false;
+ }
+
+ protected override void OnMouseUp(MouseUpEvent e)
+ {
+ base.OnMouseUp(e);
+
+ HandlingDrag = false;
+ UpdateHoverState(isHovering);
+ }
+
+ public void UpdateHoverState(bool hovering)
+ {
+ isHovering = hovering;
+
+ if (isHovering || HandlingDrag)
+ this.FadeIn(FADE_DURATION);
+ else
+ this.FadeOut(FADE_DURATION);
+ }
+ }
+ }
+}
diff --git a/osu.Game/Graphics/Containers/OsuScrollContainer.cs b/osu.Game/Graphics/Containers/OsuScrollContainer.cs
index 6d531887ed..1824fcd878 100644
--- a/osu.Game/Graphics/Containers/OsuScrollContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuScrollContainer.cs
@@ -14,6 +14,9 @@ namespace osu.Game.Graphics.Containers
{
public class OsuScrollContainer : ScrollContainer<Drawable>
{
+ public const float SCROLL_BAR_HEIGHT = 10;
+ public const float SCROLL_BAR_PADDING = 3;
+
/// <summary>
/// Allows controlling the scroll bar from any position in the container using the right mouse button.
/// Uses the value of <see cref="DistanceDecayOnRightMouseScrollbar"/> to smoothly scroll to the dragged location.
@@ -96,8 +99,6 @@ namespace osu.Game.Graphics.Containers
protected class OsuScrollbar : ScrollbarContainer
{
- private const float dim_size = 10;
-
private Color4 hoverColour;
private Color4 defaultColour;
private Color4 highlightColour;
@@ -135,7 +136,7 @@ namespace osu.Game.Graphics.Containers
public override void ResizeTo(float val, int duration = 0, Easing easing = Easing.None)
{
- Vector2 size = new Vector2(dim_size)
+ Vector2 size = new Vector2(SCROLL_BAR_HEIGHT)
{
[(int)ScrollDirection] = val
};
diff --git a/osu.Game/Graphics/DrawableDate.cs b/osu.Game/Graphics/DrawableDate.cs
index 0224c77ee8..8c520f4e10 100644
--- a/osu.Game/Graphics/DrawableDate.cs
+++ b/osu.Game/Graphics/DrawableDate.cs
@@ -4,13 +4,16 @@
using System;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics.Sprites;
using osu.Game.Utils;
+using osuTK;
namespace osu.Game.Graphics
{
- public class DrawableDate : OsuSpriteText, IHasTooltip
+ public class DrawableDate : OsuSpriteText, IHasCustomTooltip
{
private DateTimeOffset date;
@@ -75,6 +78,72 @@ namespace osu.Game.Graphics
private void updateTime() => Text = Format();
- public virtual string TooltipText => string.Format($"{Date:MMMM d, yyyy h:mm tt \"UTC\"z}");
+ public ITooltip GetCustomTooltip() => new DateTooltip();
+
+ public object TooltipContent => Date;
+
+ private class DateTooltip : VisibilityContainer, ITooltip
+ {
+ private readonly OsuSpriteText dateText, timeText;
+ private readonly Box background;
+
+ public DateTooltip()
+ {
+ AutoSizeAxes = Axes.Both;
+ Masking = true;
+ CornerRadius = 5;
+
+ Children = new Drawable[]
+ {
+ background = new Box
+ {
+ RelativeSizeAxes = Axes.Both
+ },
+ new FillFlowContainer
+ {
+ AutoSizeAxes = Axes.Both,
+ Direction = FillDirection.Horizontal,
+ Padding = new MarginPadding(10),
+ Children = new Drawable[]
+ {
+ dateText = new OsuSpriteText
+ {
+ Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
+ Anchor = Anchor.BottomLeft,
+ Origin = Anchor.BottomLeft,
+ },
+ timeText = new OsuSpriteText
+ {
+ Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular),
+ Anchor = Anchor.BottomLeft,
+ Origin = Anchor.BottomLeft,
+ }
+ }
+ },
+ };
+ }
+
+ [BackgroundDependencyLoader]
+ private void load(OsuColour colours)
+ {
+ background.Colour = colours.GreySeafoamDarker;
+ timeText.Colour = colours.BlueLighter;
+ }
+
+ protected override void PopIn() => this.FadeIn(200, Easing.OutQuint);
+ protected override void PopOut() => this.FadeOut(200, Easing.OutQuint);
+
+ public bool SetContent(object content)
+ {
+ if (!(content is DateTimeOffset date))
+ return false;
+
+ dateText.Text = $"{date:d MMMM yyyy} ";
+ timeText.Text = $"{date:hh:mm:ss \"UTC\"z}";
+ return true;
+ }
+
+ public void Move(Vector2 pos) => Position = pos;
+ }
}
}
diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index c8298543a1..59dd823266 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using System;
+using System.Globalization;
using osu.Game.Beatmaps;
using osuTK.Graphics;
@@ -14,41 +15,40 @@ namespace osu.Game.Graphics
public static Color4 FromHex(string hex)
{
- if (hex[0] == '#')
- hex = hex.Substring(1);
+ var hexSpan = hex[0] == '#' ? hex.AsSpan().Slice(1) : hex.AsSpan();
- switch (hex.Length)
+ switch (hexSpan.Length)
{
default:
throw new ArgumentException(@"Invalid hex string length!");
case 3:
return new Color4(
- (byte)(Convert.ToByte(hex.Substring(0, 1), 16) * 17),
- (byte)(Convert.ToByte(hex.Substring(1, 1), 16) * 17),
- (byte)(Convert.ToByte(hex.Substring(2, 1), 16) * 17),
+ (byte)(byte.Parse(hexSpan.Slice(0, 1), NumberStyles.HexNumber) * 17),
+ (byte)(byte.Parse(hexSpan.Slice(1, 1), NumberStyles.HexNumber) * 17),
+ (byte)(byte.Parse(hexSpan.Slice(2, 1), NumberStyles.HexNumber) * 17),
255);
case 6:
return new Color4(
- Convert.ToByte(hex.Substring(0, 2), 16),
- Convert.ToByte(hex.Substring(2, 2), 16),
- Convert.ToByte(hex.Substring(4, 2), 16),
+ byte.Parse(hexSpan.Slice(0, 2), NumberStyles.HexNumber),
+ byte.Parse(hexSpan.Slice(2, 2), NumberStyles.HexNumber),
+ byte.Parse(hexSpan.Slice(4, 2), NumberStyles.HexNumber),
255);
case 4:
return new Color4(
- (byte)(Convert.ToByte(hex.Substring(0, 1), 16) * 17),
- (byte)(Convert.ToByte(hex.Substring(1, 1), 16) * 17),
- (byte)(Convert.ToByte(hex.Substring(2, 1), 16) * 17),
- (byte)(Convert.ToByte(hex.Substring(3, 1), 16) * 17));
+ (byte)(byte.Parse(hexSpan.Slice(0, 1), NumberStyles.HexNumber) * 17),
+ (byte)(byte.Parse(hexSpan.Slice(1, 1), NumberStyles.HexNumber) * 17),
+ (byte)(byte.Parse(hexSpan.Slice(0, 1), NumberStyles.HexNumber) * 17),
+ (byte)(byte.Parse(hexSpan.Slice(0, 1), NumberStyles.HexNumber) * 17));
case 8:
return new Color4(
- Convert.ToByte(hex.Substring(0, 2), 16),
- Convert.ToByte(hex.Substring(2, 2), 16),
- Convert.ToByte(hex.Substring(4, 2), 16),
- Convert.ToByte(hex.Substring(6, 2), 16));
+ byte.Parse(hexSpan.Slice(0, 2), NumberStyles.HexNumber),
+ byte.Parse(hexSpan.Slice(2, 2), NumberStyles.HexNumber),
+ byte.Parse(hexSpan.Slice(4, 2), NumberStyles.HexNumber),
+ byte.Parse(hexSpan.Slice(6, 2), NumberStyles.HexNumber));
}
}
diff --git a/osu.Game/Graphics/ScreenshotManager.cs b/osu.Game/Graphics/ScreenshotManager.cs
index e21545688b..9804aefce8 100644
--- a/osu.Game/Graphics/ScreenshotManager.cs
+++ b/osu.Game/Graphics/ScreenshotManager.cs
@@ -35,18 +35,20 @@ namespace osu.Game.Graphics
private Bindable<ScreenshotFormat> screenshotFormat;
private Bindable<bool> captureMenuCursor;
- private GameHost host;
+ [Resolved]
+ private GameHost host { get; set; }
+
private Storage storage;
- private NotificationOverlay notificationOverlay;
+
+ [Resolved]
+ private NotificationOverlay notificationOverlay { get; set; }
private SampleChannel shutter;
[BackgroundDependencyLoader]
- private void load(GameHost host, OsuConfigManager config, Storage storage, NotificationOverlay notificationOverlay, AudioManager audio)
+ private void load(OsuConfigManager config, Storage storage, AudioManager audio)
{
- this.host = host;
this.storage = storage.GetStorageForDirectory(@"screenshots");
- this.notificationOverlay = notificationOverlay;
screenshotFormat = config.GetBindable<ScreenshotFormat>(OsuSetting.ScreenshotFormat);
captureMenuCursor = config.GetBindable<bool>(OsuSetting.ScreenshotCaptureMenuCursor);
diff --git a/osu.Game/Graphics/UserInterface/DownloadButton.cs b/osu.Game/Graphics/UserInterface/DownloadButton.cs
index 41b90d3802..86a5cb9aa6 100644
--- a/osu.Game/Graphics/UserInterface/DownloadButton.cs
+++ b/osu.Game/Graphics/UserInterface/DownloadButton.cs
@@ -19,7 +19,8 @@ namespace osu.Game.Graphics.UserInterface
private readonly SpriteIcon checkmark;
private readonly Box background;
- private OsuColour colours;
+ [Resolved]
+ private OsuColour colours { get; set; }
public DownloadButton()
{
@@ -49,10 +50,8 @@ namespace osu.Game.Graphics.UserInterface
}
[BackgroundDependencyLoader]
- private void load(OsuColour colours)
+ private void load()
{
- this.colours = colours;
-
State.BindValueChanged(updateState, true);
}
diff --git a/osu.Game/Graphics/UserInterface/ExternalLinkButton.cs b/osu.Game/Graphics/UserInterface/ExternalLinkButton.cs
index 7225dbc66f..5a1eb53fe1 100644
--- a/osu.Game/Graphics/UserInterface/ExternalLinkButton.cs
+++ b/osu.Game/Graphics/UserInterface/ExternalLinkButton.cs
@@ -18,7 +18,9 @@ namespace osu.Game.Graphics.UserInterface
public string Link { get; set; }
private Color4 hoverColour;
- private GameHost host;
+
+ [Resolved]
+ private GameHost host { get; set; }
public ExternalLinkButton(string link = null)
{
@@ -32,10 +34,9 @@ namespace osu.Game.Graphics.UserInterface
}
[BackgroundDependencyLoader]
- private void load(OsuColour colours, GameHost host)
+ private void load(OsuColour colours)
{
hoverColour = colours.Yellow;
- this.host = host;
}
protected override bool OnHover(HoverEvent e)
diff --git a/osu.Game/Graphics/UserInterface/FocusedTextBox.cs b/osu.Game/Graphics/UserInterface/FocusedTextBox.cs
index e59353a480..8977f014b6 100644
--- a/osu.Game/Graphics/UserInterface/FocusedTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/FocusedTextBox.cs
@@ -36,13 +36,12 @@ namespace osu.Game.Graphics.UserInterface
}
}
- private GameHost host;
+ [Resolved]
+ private GameHost host { get; set; }
[BackgroundDependencyLoader]
- private void load(GameHost host)
+ private void load()
{
- this.host = host;
-
BackgroundUnfocused = new Color4(10, 10, 10, 255);
BackgroundFocused = new Color4(10, 10, 10, 255);
}
diff --git a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
index e4a4b1c50e..e7699e5255 100644
--- a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
@@ -24,7 +24,8 @@ namespace osu.Game.Graphics.UserInterface
private readonly CapsWarning warning;
- private GameHost host;
+ [Resolved]
+ private GameHost host { get; set; }
public OsuPasswordTextBox()
{
@@ -38,12 +39,6 @@ namespace osu.Game.Graphics.UserInterface
});
}
- [BackgroundDependencyLoader]
- private void load(GameHost host)
- {
- this.host = host;
- }
-
protected override bool OnKeyDown(KeyDownEvent e)
{
if (e.Key == Key.CapsLock)
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index 9fa6085035..6c883d9893 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Graphics.UserInterface
private readonly Box strip;
- protected override Dropdown<T> CreateDropdown() => new OsuTabDropdown();
+ protected override Dropdown<T> CreateDropdown() => new OsuTabDropdown<T>();
protected override TabItem<T> CreateTabItem(T value) => new OsuTabItem(value);
@@ -180,100 +180,5 @@ namespace osu.Game.Graphics.UserInterface
protected override void OnDeactivated() => fadeInactive();
}
-
- // todo: this needs to go
- private class OsuTabDropdown : OsuDropdown<T>
- {
- public OsuTabDropdown()
- {
- RelativeSizeAxes = Axes.X;
- }
-
- protected override DropdownMenu CreateMenu() => new OsuTabDropdownMenu();
-
- protected override DropdownHeader CreateHeader() => new OsuTabDropdownHeader
- {
- Anchor = Anchor.TopRight,
- Origin = Anchor.TopRight
- };
-
- private class OsuTabDropdownMenu : OsuDropdownMenu
- {
- public OsuTabDropdownMenu()
- {
- Anchor = Anchor.TopRight;
- Origin = Anchor.TopRight;
-
- BackgroundColour = Color4.Black.Opacity(0.7f);
- MaxHeight = 400;
- }
-
- protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new DrawableOsuTabDropdownMenuItem(item) { AccentColour = AccentColour };
-
- private class DrawableOsuTabDropdownMenuItem : DrawableOsuDropdownMenuItem
- {
- public DrawableOsuTabDropdownMenuItem(MenuItem item)
- : base(item)
- {
- ForegroundColourHover = Color4.Black;
- }
- }
- }
-
- protected class OsuTabDropdownHeader : OsuDropdownHeader
- {
- public override Color4 AccentColour
- {
- get => base.AccentColour;
- set
- {
- base.AccentColour = value;
- Foreground.Colour = value;
- }
- }
-
- public OsuTabDropdownHeader()
- {
- RelativeSizeAxes = Axes.None;
- AutoSizeAxes = Axes.X;
-
- BackgroundColour = Color4.Black.Opacity(0.5f);
-
- Background.Height = 0.5f;
- Background.CornerRadius = 5;
- Background.Masking = true;
-
- Foreground.RelativeSizeAxes = Axes.None;
- Foreground.AutoSizeAxes = Axes.X;
- Foreground.RelativeSizeAxes = Axes.Y;
- Foreground.Margin = new MarginPadding(5);
-
- Foreground.Children = new Drawable[]
- {
- new SpriteIcon
- {
- Icon = FontAwesome.Solid.EllipsisH,
- Size = new Vector2(14),
- Origin = Anchor.Centre,
- Anchor = Anchor.Centre,
- }
- };
-
- Padding = new MarginPadding { Left = 5, Right = 5 };
- }
-
- protected override bool OnHover(HoverEvent e)
- {
- Foreground.Colour = BackgroundColour;
- return base.OnHover(e);
- }
-
- protected override void OnHoverLost(HoverLostEvent e)
- {
- Foreground.Colour = BackgroundColourHover;
- base.OnHoverLost(e);
- }
- }
- }
}
}
diff --git a/osu.Game/Graphics/UserInterface/OsuTabDropdown.cs b/osu.Game/Graphics/UserInterface/OsuTabDropdown.cs
new file mode 100644
index 0000000000..24b9ca8d90
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/OsuTabDropdown.cs
@@ -0,0 +1,107 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osuTK;
+using osuTK.Graphics;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
+
+namespace osu.Game.Graphics.UserInterface
+{
+ public class OsuTabDropdown<T> : OsuDropdown<T>
+ {
+ public OsuTabDropdown()
+ {
+ RelativeSizeAxes = Axes.X;
+ }
+
+ protected override DropdownMenu CreateMenu() => new OsuTabDropdownMenu();
+
+ protected override DropdownHeader CreateHeader() => new OsuTabDropdownHeader
+ {
+ Anchor = Anchor.TopRight,
+ Origin = Anchor.TopRight
+ };
+
+ private class OsuTabDropdownMenu : OsuDropdownMenu
+ {
+ public OsuTabDropdownMenu()
+ {
+ Anchor = Anchor.TopRight;
+ Origin = Anchor.TopRight;
+
+ BackgroundColour = Color4.Black.Opacity(0.7f);
+ MaxHeight = 400;
+ }
+
+ protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new DrawableOsuTabDropdownMenuItem(item) { AccentColour = AccentColour };
+
+ private class DrawableOsuTabDropdownMenuItem : DrawableOsuDropdownMenuItem
+ {
+ public DrawableOsuTabDropdownMenuItem(MenuItem item)
+ : base(item)
+ {
+ ForegroundColourHover = Color4.Black;
+ }
+ }
+ }
+
+ protected class OsuTabDropdownHeader : OsuDropdownHeader
+ {
+ public override Color4 AccentColour
+ {
+ get => base.AccentColour;
+ set
+ {
+ base.AccentColour = value;
+ Foreground.Colour = value;
+ }
+ }
+
+ public OsuTabDropdownHeader()
+ {
+ RelativeSizeAxes = Axes.None;
+ AutoSizeAxes = Axes.X;
+
+ BackgroundColour = Color4.Black.Opacity(0.5f);
+
+ Background.Height = 0.5f;
+ Background.CornerRadius = 5;
+ Background.Masking = true;
+
+ Foreground.RelativeSizeAxes = Axes.None;
+ Foreground.AutoSizeAxes = Axes.X;
+ Foreground.RelativeSizeAxes = Axes.Y;
+ Foreground.Margin = new MarginPadding(5);
+
+ Foreground.Children = new Drawable[]
+ {
+ new SpriteIcon
+ {
+ Icon = FontAwesome.Solid.EllipsisH,
+ Size = new Vector2(14),
+ Origin = Anchor.Centre,
+ Anchor = Anchor.Centre,
+ }
+ };
+
+ Padding = new MarginPadding { Left = 5, Right = 5 };
+ }
+
+ protected override bool OnHover(HoverEvent e)
+ {
+ Foreground.Colour = BackgroundColour;
+ return base.OnHover(e);
+ }
+
+ protected override void OnHoverLost(HoverLostEvent e)
+ {
+ Foreground.Colour = BackgroundColourHover;
+ base.OnHoverLost(e);
+ }
+ }
+ }
+}
diff --git a/osu.Game/Graphics/UserInterface/ProcessingOverlay.cs b/osu.Game/Graphics/UserInterface/ProcessingOverlay.cs
index d75e78e2d9..c65801a82e 100644
--- a/osu.Game/Graphics/UserInterface/ProcessingOverlay.cs
+++ b/osu.Game/Graphics/UserInterface/ProcessingOverlay.cs
@@ -6,20 +6,27 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events;
+using osuTK;
using osuTK.Graphics;
namespace osu.Game.Graphics.UserInterface
{
/// <summary>
- /// An overlay that will consume all available space and block input when required.
+ /// An overlay that will show a loading overlay and completely block input to an area.
+ /// Also optionally dims target elements.
/// Useful for disabling all elements in a form and showing we are waiting on a response, for instance.
/// </summary>
public class ProcessingOverlay : VisibilityContainer
{
- private const float transition_duration = 200;
+ private readonly Drawable dimTarget;
- public ProcessingOverlay()
+ private Container loadingBox;
+
+ private const float transition_duration = 600;
+
+ public ProcessingOverlay(Drawable dimTarget = null)
{
+ this.dimTarget = dimTarget;
RelativeSizeAxes = Axes.Both;
}
@@ -28,29 +35,54 @@ namespace osu.Game.Graphics.UserInterface
{
InternalChildren = new Drawable[]
{
- new Box
+ loadingBox = new Container
{
- Colour = Color4.Black,
- RelativeSizeAxes = Axes.Both,
- Alpha = 0.9f,
+ Size = new Vector2(80),
+ Scale = new Vector2(0.8f),
+ Masking = true,
+ CornerRadius = 15,
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ Children = new Drawable[]
+ {
+ new Box
+ {
+ Colour = Color4.Black,
+ RelativeSizeAxes = Axes.Both,
+ },
+ new LoadingAnimation { State = { Value = Visibility.Visible } }
+ }
},
- new LoadingAnimation { State = { Value = Visibility.Visible } }
};
}
- protected override bool Handle(UIEvent e)
- {
- return true;
- }
+ protected override bool Handle(UIEvent e) => true;
protected override void PopIn()
{
- this.FadeIn(transition_duration * 2, Easing.OutQuint);
+ this.FadeIn(transition_duration, Easing.OutQuint);
+ loadingBox.ScaleTo(1, transition_duration, Easing.OutElastic);
+
+ dimTarget?.FadeColour(OsuColour.Gray(0.5f), transition_duration, Easing.OutQuint);
}
protected override void PopOut()
{
this.FadeOut(transition_duration, Easing.OutQuint);
+ loadingBox.ScaleTo(0.8f, transition_duration / 2, Easing.In);
+
+ dimTarget?.FadeColour(Color4.White, transition_duration, Easing.OutQuint);
+ }
+
+ protected override void Dispose(bool isDisposing)
+ {
+ base.Dispose(isDisposing);
+
+ if (State.Value == Visibility.Visible)
+ {
+ // ensure we don't leave the target in a bad state.
+ dimTarget?.FadeColour(Color4.White, transition_duration, Easing.OutQuint);
+ }
}
}
}
diff --git a/osu.Game/Graphics/UserInterface/SearchTextBox.cs b/osu.Game/Graphics/UserInterface/SearchTextBox.cs
index fe8756a4d2..fe92054d25 100644
--- a/osu.Game/Graphics/UserInterface/SearchTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/SearchTextBox.cs
@@ -17,18 +17,16 @@ namespace osu.Game.Graphics.UserInterface
public SearchTextBox()
{
Height = 35;
- AddRange(new Drawable[]
+ Add(new SpriteIcon
{
- new SpriteIcon
- {
- Icon = FontAwesome.Solid.Search,
- Origin = Anchor.CentreRight,
- Anchor = Anchor.CentreRight,
- Margin = new MarginPadding { Right = 10 },
- Size = new Vector2(20),
- }
+ Icon = FontAwesome.Solid.Search,
+ Origin = Anchor.CentreRight,
+ Anchor = Anchor.CentreRight,
+ Margin = new MarginPadding { Right = 10 },
+ Size = new Vector2(20),
});
+ TextFlow.Padding = new MarginPadding { Right = 35 };
PlaceholderText = "type to search";
}
diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 23c931d161..adfef1d11f 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -22,6 +22,7 @@ namespace osu.Game.Online.API
public class APIAccess : Component, IAPIProvider
{
private readonly OsuConfigManager config;
+
private readonly OAuth authentication;
public string Endpoint => @"https://osu.ppy.sh";
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index 7f23f9b5d5..a1c3475fd9 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Online.API
public APIState State
{
get => state;
- private set
+ set
{
if (state == value)
return;
diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
index f4d67a56aa..e023a2502f 100644
--- a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
@@ -61,6 +61,9 @@ namespace osu.Game.Online.API.Requests.Responses
[JsonProperty(@"failtimes")]
private BeatmapMetrics metrics { get; set; }
+ [JsonProperty(@"max_combo")]
+ private int? maxCombo { get; set; }
+
public BeatmapInfo ToBeatmap(RulesetStore rulesets)
{
var set = BeatmapSet?.ToBeatmapSet(rulesets);
@@ -76,6 +79,7 @@ namespace osu.Game.Online.API.Requests.Responses
Status = Status,
BeatmapSet = set,
Metrics = metrics,
+ MaxCombo = maxCombo,
BaseDifficulty = new BeatmapDifficulty
{
DrainRate = drainRate,
diff --git a/osu.Game/Online/API/Requests/Responses/APILegacyScores.cs b/osu.Game/Online/API/Requests/Responses/APILegacyScores.cs
index 318fcb00de..75be9171b0 100644
--- a/osu.Game/Online/API/Requests/Responses/APILegacyScores.cs
+++ b/osu.Game/Online/API/Requests/Responses/APILegacyScores.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Online.API.Requests.Responses
public class APILegacyUserTopScoreInfo
{
[JsonProperty(@"position")]
- public int Position;
+ public int? Position;
[JsonProperty(@"score")]
public APILegacyScoreInfo Score;
diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index 5652b8d2bd..930ca8fdf1 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using System.ComponentModel;
+using osu.Framework.IO.Network;
using osu.Game.Overlays;
using osu.Game.Overlays.Direct;
using osu.Game.Rulesets;
@@ -26,8 +27,21 @@ namespace osu.Game.Online.API.Requests
this.direction = direction;
}
- // ReSharper disable once ImpureMethodCallOnReadonlyValueField
- protected override string Target => $@"beatmapsets/search?q={query}&m={ruleset.ID ?? 0}&s={searchCategory.ToString().ToLowerInvariant()}&sort={sortCriteria.ToString().ToLowerInvariant()}_{directionString}";
+ protected override WebRequest CreateWebRequest()
+ {
+ var req = base.CreateWebRequest();
+ req.AddParameter("q", query);
+
+ if (ruleset.ID.HasValue)
+ req.AddParameter("m", ruleset.ID.Value.ToString());
+
+ req.AddParameter("s", searchCategory.ToString().ToLowerInvariant());
+ req.AddParameter("sort", $"{sortCriteria.ToString().ToLowerInvariant()}_{directionString}");
+
+ return req;
+ }
+
+ protected override string Target => @"beatmapsets/search";
}
public enum BeatmapSearchCategory
diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs
index 28863cb0e0..3c4fb11ed1 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs
@@ -2,12 +2,17 @@
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
+using Newtonsoft.Json;
using osu.Game.Online.API.Requests.Responses;
namespace osu.Game.Online.API.Requests
{
public class SearchBeatmapSetsResponse : ResponseWithCursor
{
+ [JsonProperty("beatmapsets")]
public IEnumerable<APIBeatmapSet> BeatmapSets;
+
+ [JsonProperty("total")]
+ public int Total;
}
}
diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index 4b5ec1cad0..2c37216fd6 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -48,7 +48,8 @@ namespace osu.Game.Online.Chat
/// </summary>
public IBindableList<Channel> AvailableChannels => availableChannels;
- private IAPIProvider api;
+ [Resolved]
+ private IAPIProvider api { get; set; }
public readonly BindableBool HighPollRate = new BindableBool();
@@ -466,12 +467,6 @@ namespace osu.Game.Online.Chat
api.Queue(req);
}
-
- [BackgroundDependencyLoader]
- private void load(IAPIProvider api)
- {
- this.api = api;
- }
}
/// <summary>
diff --git a/osu.Game/Online/Chat/ExternalLinkOpener.cs b/osu.Game/Online/Chat/ExternalLinkOpener.cs
index 495f1ac0b0..8407e2ca6a 100644
--- a/osu.Game/Online/Chat/ExternalLinkOpener.cs
+++ b/osu.Game/Online/Chat/ExternalLinkOpener.cs
@@ -13,15 +13,17 @@ namespace osu.Game.Online.Chat
{
public class ExternalLinkOpener : Component
{
- private GameHost host;
- private DialogOverlay dialogOverlay;
+ [Resolved]
+ private GameHost host { get; set; }
+
+ [Resolved(CanBeNull = true)]
+ private DialogOverlay dialogOverlay { get; set; }
+
private Bindable<bool> externalLinkWarning;
[BackgroundDependencyLoader(true)]
- private void load(GameHost host, DialogOverlay dialogOverlay, OsuConfigManager config)
+ private void load(OsuConfigManager config)
{
- this.host = host;
- this.dialogOverlay = dialogOverlay;
externalLinkWarning = config.GetBindable<bool>(OsuSetting.ExternalLinkWarning);
}
diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 9a0e112727..6e7ef99c6d 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -19,7 +19,8 @@ namespace osu.Game.Online
{
protected readonly Bindable<TModel> Model = new Bindable<TModel>();
- private TModelManager manager;
+ [Resolved(CanBeNull = true)]
+ private TModelManager manager { get; set; }
/// <summary>
/// Holds the current download state of the <typeparamref name="TModel"/>, whether is has already been downloaded, is in progress, or is not downloaded.
@@ -34,10 +35,8 @@ namespace osu.Game.Online
}
[BackgroundDependencyLoader(true)]
- private void load(TModelManager manager)
+ private void load()
{
- this.manager = manager;
-
Model.BindValueChanged(modelInfo =>
{
if (modelInfo.NewValue == null)
diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index bd4fedabd4..71859d3aeb 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -152,7 +152,7 @@ namespace osu.Game.Online.Leaderboards
break;
case PlaceholderState.NotLoggedIn:
- replacePlaceholder(new LoginPlaceholder());
+ replacePlaceholder(new LoginPlaceholder(@"Please sign in to view online leaderboards!"));
break;
case PlaceholderState.NotSupporter:
@@ -217,14 +217,14 @@ namespace osu.Game.Online.Leaderboards
Scores = null;
}
- private IAPIProvider api;
+ [Resolved(CanBeNull = true)]
+ private IAPIProvider api { get; set; }
private ScheduledDelegate pendingUpdateScores;
- [BackgroundDependencyLoader(true)]
- private void load(IAPIProvider api)
+ [BackgroundDependencyLoader]
+ private void load()
{
- this.api = api;
api?.Register(this);
}
diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 1f52a4481b..ba92b993a2 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Online.Leaderboards
protected Container RankContainer { get; private set; }
private readonly ScoreInfo score;
- private readonly int rank;
+ private readonly int? rank;
private readonly bool allowHighlight;
private Box background;
@@ -58,7 +58,7 @@ namespace osu.Game.Online.Leaderboards
[Resolved(CanBeNull = true)]
private DialogOverlay dialogOverlay { get; set; }
- public LeaderboardScore(ScoreInfo score, int rank, bool allowHighlight = true)
+ public LeaderboardScore(ScoreInfo score, int? rank, bool allowHighlight = true)
{
this.score = score;
this.rank = rank;
@@ -90,7 +90,7 @@ namespace osu.Game.Online.Leaderboards
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Font = OsuFont.GetFont(size: 20, italics: true),
- Text = rank.ToMetric(decimals: rank < 100000 ? 1 : 0),
+ Text = rank == null ? "-" : rank.Value.ToMetric(decimals: rank < 100000 ? 1 : 0),
},
},
},
diff --git a/osu.Game/Online/Multiplayer/PlaylistItem.cs b/osu.Game/Online/Multiplayer/PlaylistItem.cs
index 69e1f0db13..11e4854174 100644
--- a/osu.Game/Online/Multiplayer/PlaylistItem.cs
+++ b/osu.Game/Online/Multiplayer/PlaylistItem.cs
@@ -93,12 +93,5 @@ namespace osu.Game.Online.Multiplayer
public bool ShouldSerializeapiBeatmap() => false;
public bool Equals(PlaylistItem other) => ID == other?.ID && BeatmapID == other.BeatmapID && RulesetID == other.RulesetID;
-
- public override int GetHashCode()
- {
- // ReSharper disable NonReadonlyMemberInGetHashCode
- return HashCode.Combine(ID, BeatmapID, RulesetID);
- // ReSharper restore NonReadonlyMemberInGetHashCode
- }
}
}
diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index 400afb39a1..2bfcc019fa 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -118,13 +118,26 @@ namespace osu.Game.Online.Multiplayer
if (DateTimeOffset.Now >= EndDate.Value)
Status.Value = new RoomStatusEnded();
- foreach (var removedItem in Playlist.Except(other.Playlist).ToArray())
- Playlist.Remove(removedItem);
- Playlist.AddRange(other.Playlist.Except(Playlist).ToArray());
+ // transfer local beatmaps across to ensure we have Metadata available (CreateRoomRequest does not give us metadata as expected)
+ foreach (var item in other.Playlist)
+ {
+ var localItem = Playlist.FirstOrDefault(i => i.BeatmapID == item.BeatmapID);
- foreach (var removedItem in Participants.Except(other.Participants).ToArray())
- Participants.Remove(removedItem);
- Participants.AddRange(other.Participants.Except(Participants).ToArray());
+ if (localItem != null)
+ item.Beatmap.Value.Metadata = localItem.Beatmap.Value.Metadata;
+ }
+
+ if (!Playlist.SequenceEqual(other.Playlist))
+ {
+ Playlist.Clear();
+ Playlist.AddRange(other.Playlist);
+ }
+
+ if (!Participants.SequenceEqual(other.Participants))
+ {
+ Participants.Clear();
+ Participants.AddRange(other.Participants);
+ }
Position = other.Position;
}
diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
new file mode 100644
index 0000000000..689c1c0afb
--- /dev/null
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -0,0 +1,100 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API;
+using osu.Game.Online.Placeholders;
+
+namespace osu.Game.Online
+{
+ /// <summary>
+ /// A <see cref="Container"/> for displaying online content which require a local user to be logged in.
+ /// Shows its children only when the local user is logged in and supports displaying a placeholder if not.
+ /// </summary>
+ public abstract class OnlineViewContainer : Container, IOnlineComponent
+ {
+ protected LoadingAnimation LoadingAnimation { get; private set; }
+
+ protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
+
+ private readonly string placeholderMessage;
+
+ private Placeholder placeholder;
+
+ private const double transform_duration = 300;
+
+ [Resolved]
+ protected IAPIProvider API { get; private set; }
+
+ protected OnlineViewContainer(string placeholderMessage)
+ {
+ this.placeholderMessage = placeholderMessage;
+ }
+
+ [BackgroundDependencyLoader]
+ private void load()
+ {
+ InternalChildren = new Drawable[]
+ {
+ Content,
+ placeholder = new LoginPlaceholder(placeholderMessage),
+ LoadingAnimation = new LoadingAnimation
+ {
+ Alpha = 0,
+ }
+ };
+ }
+
+ protected override void LoadComplete()
+ {
+ base.LoadComplete();
+
+ API.Register(this);
+ }
+
+ public virtual void APIStateChanged(IAPIProvider api, APIState state)
+ {
+ switch (state)
+ {
+ case APIState.Offline:
+ PopContentOut(Content);
+ placeholder.ScaleTo(0.8f).Then().ScaleTo(1, 3 * transform_duration, Easing.OutQuint);
+ placeholder.FadeInFromZero(2 * transform_duration, Easing.OutQuint);
+ LoadingAnimation.Hide();
+ break;
+
+ case APIState.Online:
+ PopContentIn(Content);
+ placeholder.FadeOut(transform_duration / 2, Easing.OutQuint);
+ LoadingAnimation.Hide();
+ break;
+
+ case APIState.Failing:
+ case APIState.Connecting:
+ PopContentOut(Content);
+ LoadingAnimation.Show();
+ placeholder.FadeOut(transform_duration / 2, Easing.OutQuint);
+ break;
+ }
+ }
+
+ /// <summary>
+ /// Applies a transform to the online content to make it hidden.
+ /// </summary>
+ protected virtual void PopContentOut(Drawable content) => content.FadeOut(transform_duration / 2, Easing.OutQuint);
+
+ /// <summary>
+ /// Applies a transform to the online content to make it visible.
+ /// </summary>
+ protected virtual void PopContentIn(Drawable content) => content.FadeIn(transform_duration, Easing.OutQuint);
+
+ protected override void Dispose(bool isDisposing)
+ {
+ API?.Unregister(this);
+ base.Dispose(isDisposing);
+ }
+ }
+}
diff --git a/osu.Game/Online/Placeholders/LoginPlaceholder.cs b/osu.Game/Online/Placeholders/LoginPlaceholder.cs
index 591eb976e2..73b0fa27c3 100644
--- a/osu.Game/Online/Placeholders/LoginPlaceholder.cs
+++ b/osu.Game/Online/Placeholders/LoginPlaceholder.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Online.Placeholders
[Resolved(CanBeNull = true)]
private LoginOverlay login { get; set; }
- public LoginPlaceholder()
+ public LoginPlaceholder(string actionMessage)
{
AddIcon(FontAwesome.Solid.UserLock, cp =>
{
@@ -22,7 +22,7 @@ namespace osu.Game.Online.Placeholders
cp.Padding = new MarginPadding { Right = 10 };
});
- AddText(@"Please sign in to view online leaderboards!");
+ AddText(actionMessage);
}
protected override bool OnMouseDown(MouseDownEvent e)
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index e7fffd49b4..100730d40d 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -150,10 +150,8 @@ namespace osu.Game
dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
[BackgroundDependencyLoader]
- private void load(FrameworkConfigManager frameworkConfig)
+ private void load()
{
- this.frameworkConfig = frameworkConfig;
-
if (!Host.IsPrimaryInstance && !DebugUtils.IsDebugBuild)
{
Logger.Log(@"osu! does not support multiple running instances.", LoggingTarget.Runtime, LogLevel.Error);
@@ -881,7 +879,8 @@ namespace osu.Game
private Container topMostOverlayContent;
- private FrameworkConfigManager frameworkConfig;
+ [Resolved]
+ private FrameworkConfigManager frameworkConfig { get; set; }
private ScalingContainer screenContainer;
diff --git a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
index 7067e02cd2..454fce0261 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
@@ -33,23 +33,26 @@ namespace osu.Game.Overlays.AccountCreation
private OsuTextBox emailTextBox;
private OsuPasswordTextBox passwordTextBox;
- private IAPIProvider api;
+ [Resolved]
+ private IAPIProvider api { get; set; }
+
private ShakeContainer registerShake;
private IEnumerable<Drawable> characterCheckText;
private OsuTextBox[] textboxes;
private ProcessingOverlay processingOverlay;
- private GameHost host;
+
+ [Resolved]
+ private GameHost host { get; set; }
[BackgroundDependencyLoader]
- private void load(OsuColour colours, IAPIProvider api, GameHost host)
+ private void load(OsuColour colours)
{
- this.api = api;
- this.host = host;
+ FillFlowContainer mainContent;
InternalChildren = new Drawable[]
{
- new FillFlowContainer
+ mainContent = new FillFlowContainer
{
RelativeSizeAxes = Axes.Both,
Direction = FillDirection.Vertical,
@@ -121,7 +124,7 @@ namespace osu.Game.Overlays.AccountCreation
},
},
},
- processingOverlay = new ProcessingOverlay { Alpha = 0 }
+ processingOverlay = new ProcessingOverlay(mainContent)
};
textboxes = new[] { usernameTextBox, emailTextBox, passwordTextBox };
diff --git a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
index f91d2e3323..5375476c9e 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
@@ -22,7 +22,9 @@ namespace osu.Game.Overlays.AccountCreation
{
private OsuTextFlowContainer multiAccountExplanationText;
private LinkFlowContainer furtherAssistance;
- private IAPIProvider api;
+
+ [Resolved(CanBeNull = true)]
+ private IAPIProvider api { get; set; }
private const string help_centre_url = "/help/wiki/Help_Centre#login";
@@ -39,10 +41,8 @@ namespace osu.Game.Overlays.AccountCreation
}
[BackgroundDependencyLoader(true)]
- private void load(OsuColour colours, IAPIProvider api, OsuGame game, TextureStore textures)
+ private void load(OsuColour colours, OsuGame game, TextureStore textures)
{
- this.api = api;
-
if (string.IsNullOrEmpty(api.ProvidedUsername))
return;
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs
new file mode 100644
index 0000000000..5af92914de
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs
@@ -0,0 +1,24 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+ public class BeatmapListingHeader : OverlayHeader
+ {
+ protected override ScreenTitle CreateTitle() => new BeatmapListingTitle();
+
+ private class BeatmapListingTitle : ScreenTitle
+ {
+ public BeatmapListingTitle()
+ {
+ Title = @"beatmap";
+ Section = @"listing";
+ }
+
+ protected override Drawable CreateIcon() => new ScreenTitleTextureIcon(@"Icons/changelog");
+ }
+ }
+}
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
new file mode 100644
index 0000000000..f9799d8a6b
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
@@ -0,0 +1,127 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Online.API.Requests;
+using osu.Game.Rulesets;
+using osuTK;
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps.Drawables;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+ public class BeatmapListingSearchSection : CompositeDrawable
+ {
+ public Bindable<string> Query => textBox.Current;
+
+ public Bindable<RulesetInfo> Ruleset => modeFilter.Current;
+
+ public Bindable<BeatmapSearchCategory> Category => categoryFilter.Current;
+
+ public BeatmapSetInfo BeatmapSet
+ {
+ set
+ {
+ if (value == null || string.IsNullOrEmpty(value.OnlineInfo.Covers.Cover))
+ {
+ beatmapCover.FadeOut(600, Easing.OutQuint);
+ return;
+ }
+
+ beatmapCover.BeatmapSet = value;
+ beatmapCover.FadeTo(0.1f, 200, Easing.OutQuint);
+ }
+ }
+
+ private readonly BeatmapSearchTextBox textBox;
+ private readonly BeatmapSearchRulesetFilterRow modeFilter;
+ private readonly BeatmapSearchFilterRow<BeatmapSearchCategory> categoryFilter;
+
+ private readonly Box background;
+ private readonly UpdateableBeatmapSetCover beatmapCover;
+
+ public BeatmapListingSearchSection()
+ {
+ AutoSizeAxes = Axes.Y;
+ RelativeSizeAxes = Axes.X;
+ AddRangeInternal(new Drawable[]
+ {
+ background = new Box
+ {
+ RelativeSizeAxes = Axes.Both
+ },
+ new Container
+ {
+ RelativeSizeAxes = Axes.Both,
+ Masking = true,
+ Child = beatmapCover = new UpdateableBeatmapSetCover
+ {
+ RelativeSizeAxes = Axes.Both,
+ Alpha = 0,
+ }
+ },
+ new Container
+ {
+ AutoSizeAxes = Axes.Y,
+ RelativeSizeAxes = Axes.X,
+ Padding = new MarginPadding
+ {
+ Vertical = 20,
+ Horizontal = 40,
+ },
+ Child = new FillFlowContainer
+ {
+ AutoSizeAxes = Axes.Y,
+ RelativeSizeAxes = Axes.X,
+ Direction = FillDirection.Vertical,
+ Spacing = new Vector2(0, 20),
+ Children = new Drawable[]
+ {
+ textBox = new BeatmapSearchTextBox
+ {
+ RelativeSizeAxes = Axes.X,
+ },
+ new ReverseChildIDFillFlowContainer<Drawable>
+ {
+ AutoSizeAxes = Axes.Y,
+ RelativeSizeAxes = Axes.X,
+ Direction = FillDirection.Vertical,
+ Padding = new MarginPadding { Horizontal = 10 },
+ Children = new Drawable[]
+ {
+ modeFilter = new BeatmapSearchRulesetFilterRow(),
+ categoryFilter = new BeatmapSearchFilterRow<BeatmapSearchCategory>(@"Categories"),
+ }
+ }
+ }
+ }
+ }
+ });
+
+ Category.Value = BeatmapSearchCategory.Leaderboard;
+ }
+
+ [BackgroundDependencyLoader]
+ private void load(OverlayColourProvider colourProvider)
+ {
+ background.Colour = colourProvider.Dark6;
+ }
+
+ private class BeatmapSearchTextBox : SearchTextBox
+ {
+ protected override Color4 SelectionColour => Color4.Gray;
+
+ public BeatmapSearchTextBox()
+ {
+ PlaceholderText = @"type in keywords...";
+ }
+ }
+ }
+}
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
new file mode 100644
index 0000000000..27c43b092a
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
@@ -0,0 +1,108 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Graphics;
+using osuTK.Graphics;
+using osuTK;
+using osu.Framework.Input.Events;
+using osu.Game.Overlays.Direct;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+ public class BeatmapListingSortTabControl : OverlaySortTabControl<DirectSortCriteria>
+ {
+ public readonly Bindable<SortDirection> SortDirection = new Bindable<SortDirection>(Overlays.SortDirection.Descending);
+
+ public BeatmapListingSortTabControl()
+ {
+ Current.Value = DirectSortCriteria.Ranked;
+ }
+
+ protected override SortTabControl CreateControl() => new BeatmapSortTabControl
+ {
+ SortDirection = { BindTarget = SortDirection }
+ };
+
+ private class BeatmapSortTabControl : SortTabControl
+ {
+ public readonly Bindable<SortDirection> SortDirection = new Bindable<SortDirection>();
+
+ protected override TabItem<DirectSortCriteria> CreateTabItem(DirectSortCriteria value) => new BeatmapSortTabItem(value)
+ {
+ SortDirection = { BindTarget = SortDirection }
+ };
+ }
+
+ private class BeatmapSortTabItem : SortTabItem
+ {
+ public readonly Bindable<SortDirection> SortDirection = new Bindable<SortDirection>();
+
+ public BeatmapSortTabItem(DirectSortCriteria value)
+ : base(value)
+ {
+ }
+
+ protected override TabButton CreateTabButton(DirectSortCriteria value) => new BeatmapTabButton(value)
+ {
+ Active = { BindTarget = Active },
+ SortDirection = { BindTarget = SortDirection }
+ };
+ }
+
+ private class BeatmapTabButton : TabButton
+ {
+ public readonly Bindable<SortDirection> SortDirection = new Bindable<SortDirection>();
+
+ protected override Color4 ContentColour
+ {
+ set
+ {
+ base.ContentColour = value;
+ icon.Colour = value;
+ }
+ }
+
+ private readonly SpriteIcon icon;
+
+ public BeatmapTabButton(DirectSortCriteria value)
+ : base(value)
+ {
+ Add(icon = new SpriteIcon
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ AlwaysPresent = true,
+ Alpha = 0,
+ Size = new Vector2(6)
+ });
+ }
+
+ protected override void LoadComplete()
+ {
+ base.LoadComplete();
+
+ SortDirection.BindValueChanged(direction =>
+ {
+ icon.Icon = direction.NewValue == Overlays.SortDirection.Ascending ? FontAwesome.Solid.CaretUp : FontAwesome.Solid.CaretDown;
+ }, true);
+ }
+
+ protected override void UpdateState()
+ {
+ base.UpdateState();
+ icon.FadeTo(Active.Value || IsHovered ? 1 : 0, 200, Easing.OutQuint);
+ }
+
+ protected override bool OnClick(ClickEvent e)
+ {
+ if (Active.Value)
+ SortDirection.Value = SortDirection.Value == Overlays.SortDirection.Ascending ? Overlays.SortDirection.Descending : Overlays.SortDirection.Ascending;
+
+ return base.OnClick(e);
+ }
+ }
+ }
+}
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
new file mode 100644
index 0000000000..2c046a2bbf
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
@@ -0,0 +1,173 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+ public class BeatmapSearchFilterRow<T> : CompositeDrawable, IHasCurrentValue<T>
+ {
+ private readonly BindableWithCurrent<T> current = new BindableWithCurrent<T>();
+
+ public Bindable<T> Current
+ {
+ get => current.Current;
+ set => current.Current = value;
+ }
+
+ public BeatmapSearchFilterRow(string headerName)
+ {
+ AutoSizeAxes = Axes.Y;
+ RelativeSizeAxes = Axes.X;
+ AddInternal(new GridContainer
+ {
+ AutoSizeAxes = Axes.Y,
+ RelativeSizeAxes = Axes.X,
+ ColumnDimensions = new[]
+ {
+ new Dimension(GridSizeMode.Absolute, size: 100),
+ new Dimension()
+ },
+ RowDimensions = new[]
+ {
+ new Dimension(GridSizeMode.AutoSize)
+ },
+ Content = new[]
+ {
+ new Drawable[]
+ {
+ new OsuSpriteText
+ {
+ Anchor = Anchor.BottomLeft,
+ Origin = Anchor.BottomLeft,
+ Font = OsuFont.GetFont(size: 10),
+ Text = headerName.ToUpper()
+ },
+ CreateFilter().With(f =>
+ {
+ f.Current = current;
+ })
+ }
+ }
+ });
+ }
+
+ [NotNull]
+ protected virtual BeatmapSearchFilter CreateFilter() => new BeatmapSearchFilter();
+
+ protected class BeatmapSearchFilter : TabControl<T>
+ {
+ public BeatmapSearchFilter()
+ {
+ Anchor = Anchor.BottomLeft;
+ Origin = Anchor.BottomLeft;
+ RelativeSizeAxes = Axes.X;
+ Height = 15;
+
+ TabContainer.Spacing = new Vector2(10, 0);
+
+ if (typeof(T).IsEnum)
+ {
+ foreach (var val in (T[])Enum.GetValues(typeof(T)))
+ AddItem(val);
+ }
+ }
+
+ [BackgroundDependencyLoader]
+ private void load(OverlayColourProvider colourProvider)
+ {
+ ((FilterDropdown)Dropdown).AccentColour = colourProvider.Light2;
+ }
+
+ protected override Dropdown<T> CreateDropdown() => new FilterDropdown();
+
+ protected override TabItem<T> CreateTabItem(T value) => new FilterTabItem(value);
+
+ protected class FilterTabItem : TabItem<T>
+ {
+ protected virtual float TextSize => 13;
+
+ [Resolved]
+ private OverlayColourProvider colourProvider { get; set; }
+
+ private readonly OsuSpriteText text;
+
+ public FilterTabItem(T value)
+ : base(value)
+ {
+ AutoSizeAxes = Axes.Both;
+ Anchor = Anchor.BottomLeft;
+ Origin = Anchor.BottomLeft;
+ AddRangeInternal(new Drawable[]
+ {
+ text = new OsuSpriteText
+ {
+ Font = OsuFont.GetFont(size: TextSize, weight: FontWeight.Regular),
+ Text = (value as Enum)?.GetDescription() ?? value.ToString()
+ },
+ new HoverClickSounds()
+ });
+
+ Enabled.Value = true;
+ }
+
+ [BackgroundDependencyLoader]
+ private void load()
+ {
+ updateState();
+ }
+
+ protected override bool OnHover(HoverEvent e)
+ {
+ base.OnHover(e);
+ updateState();
+ return true;
+ }
+
+ protected override void OnHoverLost(HoverLostEvent e)
+ {
+ base.OnHoverLost(e);
+ updateState();
+ }
+
+ protected override void OnActivated() => updateState();
+
+ protected override void OnDeactivated() => updateState();
+
+ private void updateState() => text.FadeColour(Active.Value ? Color4.White : getStateColour(), 200, Easing.OutQuint);
+
+ private Color4 getStateColour() => IsHovered ? colourProvider.Light1 : colourProvider.Light3;
+ }
+
+ private class FilterDropdown : OsuTabDropdown<T>
+ {
+ protected override DropdownHeader CreateHeader() => new FilterHeader
+ {
+ Anchor = Anchor.TopRight,
+ Origin = Anchor.TopRight
+ };
+
+ private class FilterHeader : OsuTabDropdownHeader
+ {
+ public FilterHeader()
+ {
+ Background.Height = 1;
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilterRow.cs
new file mode 100644
index 0000000000..eebd896cf9
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilterRow.cs
@@ -0,0 +1,33 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Game.Rulesets;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+ public class BeatmapSearchRulesetFilterRow : BeatmapSearchFilterRow<RulesetInfo>
+ {
+ public BeatmapSearchRulesetFilterRow()
+ : base(@"Mode")
+ {
+ }
+
+ protected override BeatmapSearchFilter CreateFilter() => new RulesetFilter();
+
+ private class RulesetFilter : BeatmapSearchFilter
+ {
+ [BackgroundDependencyLoader]
+ private void load(RulesetStore rulesets)
+ {
+ AddItem(new RulesetInfo
+ {
+ Name = @"Any"
+ });
+
+ foreach (var r in rulesets.AvailableRulesets)
+ AddItem(r);
+ }
+ }
+ }
+}
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchSmallFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchSmallFilterRow.cs
new file mode 100644
index 0000000000..6daa7cb0e0
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchSmallFilterRow.cs
@@ -0,0 +1,32 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics.UserInterface;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+ public class BeatmapSearchSmallFilterRow<T> : BeatmapSearchFilterRow<T>
+ {
+ public BeatmapSearchSmallFilterRow(string headerName)
+ : base(headerName)
+ {
+ }
+
+ protected override BeatmapSearchFilter CreateFilter() => new SmallBeatmapSearchFilter();
+
+ private class SmallBeatmapSearchFilter : BeatmapSearchFilter
+ {
+ protected override TabItem<T> CreateTabItem(T value) => new SmallTabItem(value);
+
+ private class SmallTabItem : FilterTabItem
+ {
+ public SmallTabItem(T value)
+ : base(value)
+ {
+ }
+
+ protected override float TextSize => 10;
+ }
+ }
+ }
+}
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
new file mode 100644
index 0000000000..213e9a4244
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -0,0 +1,299 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Threading;
+using osu.Game.Audio;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API.Requests;
+using osu.Game.Overlays.BeatmapListing;
+using osu.Game.Overlays.Direct;
+using osu.Game.Rulesets;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays
+{
+ public class BeatmapListingOverlay : FullscreenOverlay
+ {
+ [Resolved]
+ private PreviewTrackManager previewTrackManager { get; set; }
+
+ [Resolved]
+ private RulesetStore rulesets { get; set; }
+
+ private SearchBeatmapSetsRequest getSetsRequest;
+
+ private Container panelsPlaceholder;
+ private Drawable currentContent;
+ private BeatmapListingSearchSection searchSection;
+ private BeatmapListingSortTabControl sortControl;
+
+ public BeatmapListingOverlay()
+ : base(OverlayColourScheme.Blue)
+ {
+ }
+
+ [BackgroundDependencyLoader]
+ private void load()
+ {
+ Children = new Drawable[]
+ {
+ new Box
+ {
+ RelativeSizeAxes = Axes.Both,
+ Colour = ColourProvider.Background6
+ },
+ new BasicScrollContainer
+ {
+ RelativeSizeAxes = Axes.Both,
+ ScrollbarVisible = false,
+ Child = new ReverseChildIDFillFlowContainer<Drawable>
+ {
+ AutoSizeAxes = Axes.Y,
+ RelativeSizeAxes = Axes.X,
+ Direction = FillDirection.Vertical,
+ Spacing = new Vector2(0, 10),
+ Children = new Drawable[]
+ {
+ new FillFlowContainer
+ {
+ AutoSizeAxes = Axes.Y,
+ RelativeSizeAxes = Axes.X,
+ Direction = FillDirection.Vertical,
+ Masking = true,
+ EdgeEffect = new EdgeEffectParameters
+ {
+ Colour = Color4.Black.Opacity(0.25f),
+ Type = EdgeEffectType.Shadow,
+ Radius = 3,
+ Offset = new Vector2(0f, 1f),
+ },
+ Children = new Drawable[]
+ {
+ new BeatmapListingHeader(),
+ searchSection = new BeatmapListingSearchSection(),
+ }
+ },
+ new Container
+ {
+ AutoSizeAxes = Axes.Y,
+ RelativeSizeAxes = Axes.X,
+ Children = new Drawable[]
+ {
+ new Box
+ {
+ RelativeSizeAxes = Axes.Both,
+ Colour = ColourProvider.Background4,
+ },
+ new FillFlowContainer
+ {
+ RelativeSizeAxes = Axes.X,
+ AutoSizeAxes = Axes.Y,
+ Children = new Drawable[]
+ {
+ new Container
+ {
+ RelativeSizeAxes = Axes.X,
+ Height = 40,
+ Children = new Drawable[]
+ {
+ new Box
+ {
+ RelativeSizeAxes = Axes.Both,
+ Colour = ColourProvider.Background5
+ },
+ sortControl = new BeatmapListingSortTabControl
+ {
+ Anchor = Anchor.CentreLeft,
+ Origin = Anchor.CentreLeft,
+ Margin = new MarginPadding { Left = 20 }
+ }
+ }
+ },
+ panelsPlaceholder = new Container
+ {
+ AutoSizeAxes = Axes.Y,
+ RelativeSizeAxes = Axes.X,
+ Padding = new MarginPadding { Horizontal = 20 },
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ };
+ }
+
+ protected override void LoadComplete()
+ {
+ base.LoadComplete();
+
+ var sortCriteria = sortControl.Current;
+ var sortDirection = sortControl.SortDirection;
+
+ searchSection.Query.BindValueChanged(query =>
+ {
+ sortCriteria.Value = string.IsNullOrEmpty(query.NewValue) ? DirectSortCriteria.Ranked : DirectSortCriteria.Relevance;
+ sortDirection.Value = SortDirection.Descending;
+
+ queueUpdateSearch(true);
+ });
+
+ searchSection.Ruleset.BindValueChanged(_ => queueUpdateSearch());
+ searchSection.Category.BindValueChanged(_ => queueUpdateSearch());
+ sortCriteria.BindValueChanged(_ => queueUpdateSearch());
+ sortDirection.BindValueChanged(_ => queueUpdateSearch());
+ }
+
+ private ScheduledDelegate queryChangedDebounce;
+
+ private void queueUpdateSearch(bool queryTextChanged = false)
+ {
+ getSetsRequest?.Cancel();
+
+ queryChangedDebounce?.Cancel();
+ queryChangedDebounce = Scheduler.AddDelayed(updateSearch, queryTextChanged ? 500 : 100);
+ }
+
+ private void updateSearch()
+ {
+ if (!IsLoaded)
+ return;
+
+ if (State.Value == Visibility.Hidden)
+ return;
+
+ if (API == null)
+ return;
+
+ previewTrackManager.StopAnyPlaying(this);
+
+ currentContent?.FadeColour(Color4.DimGray, 400, Easing.OutQuint);
+
+ getSetsRequest = new SearchBeatmapSetsRequest(
+ searchSection.Query.Value,
+ searchSection.Ruleset.Value,
+ searchSection.Category.Value,
+ sortControl.Current.Value,
+ sortControl.SortDirection.Value);
+
+ getSetsRequest.Success += response => Schedule(() => recreatePanels(response));
+
+ API.Queue(getSetsRequest);
+ }
+
+ private void recreatePanels(SearchBeatmapSetsResponse response)
+ {
+ if (response.Total == 0)
+ {
+ searchSection.BeatmapSet = null;
+ LoadComponentAsync(new NotFoundDrawable(), addContentToPlaceholder);
+ return;
+ }
+
+ var beatmaps = response.BeatmapSets.Select(r => r.ToBeatmapSet(rulesets)).ToList();
+
+ var newPanels = new FillFlowContainer<DirectPanel>
+ {
+ RelativeSizeAxes = Axes.X,
+ AutoSizeAxes = Axes.Y,
+ Spacing = new Vector2(10),
+ Alpha = 0,
+ Margin = new MarginPadding { Vertical = 15 },
+ ChildrenEnumerable = beatmaps.Select<BeatmapSetInfo, DirectPanel>(b => new DirectGridPanel(b)
+ {
+ Anchor = Anchor.TopCentre,
+ Origin = Anchor.TopCentre,
+ })
+ };
+
+ LoadComponentAsync(newPanels, loaded =>
+ {
+ addContentToPlaceholder(loaded);
+ searchSection.BeatmapSet = beatmaps.First();
+ });
+ }
+
+ private void addContentToPlaceholder(Drawable content)
+ {
+ Drawable lastContent = currentContent;
+
+ if (lastContent != null)
+ {
+ lastContent.FadeOut(100, Easing.OutQuint).Expire();
+
+ // Consider the case when the new content is smaller than the last content.
+ // If the auto-size computation is delayed until fade out completes, the background remain high for too long making the resulting transition to the smaller height look weird.
+ // At the same time, if the last content's height is bypassed immediately, there is a period where the new content is at Alpha = 0 when the auto-sized height will be 0.
+ // To resolve both of these issues, the bypass is delayed until a point when the content transitions (fade-in and fade-out) overlap and it looks good to do so.
+ lastContent.Delay(25).Schedule(() => lastContent.BypassAutoSizeAxes = Axes.Y);
+ }
+
+ panelsPlaceholder.Add(currentContent = content);
+ currentContent.FadeIn(200, Easing.OutQuint);
+ }
+
+ protected override void Dispose(bool isDisposing)
+ {
+ getSetsRequest?.Cancel();
+ queryChangedDebounce?.Cancel();
+
+ base.Dispose(isDisposing);
+ }
+
+ private class NotFoundDrawable : CompositeDrawable
+ {
+ public NotFoundDrawable()
+ {
+ RelativeSizeAxes = Axes.X;
+ Height = 250;
+ Alpha = 0;
+ Margin = new MarginPadding { Top = 15 };
+ }
+
+ [BackgroundDependencyLoader]
+ private void load(TextureStore textures)
+ {
+ AddInternal(new FillFlowContainer
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ RelativeSizeAxes = Axes.Y,
+ AutoSizeAxes = Axes.X,
+ Direction = FillDirection.Horizontal,
+ Spacing = new Vector2(10, 0),
+ Children = new Drawable[]
+ {
+ new Sprite
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ RelativeSizeAxes = Axes.Both,
+ FillMode = FillMode.Fit,
+ Texture = textures.Get(@"Online/not-found")
+ },
+ new OsuSpriteText
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ Text = @"... nope, nothing found.",
+ }
+ }
+ });
+ }
+ }
+ }
+}
diff --git a/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs b/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
index a6ff0ebeb8..446a075ae4 100644
--- a/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
+++ b/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
@@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
+using System;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@@ -50,7 +51,7 @@ namespace osu.Game.Overlays.BeatmapSet
fields.Children = new Drawable[]
{
new Field("mapped by", BeatmapSet.Metadata.Author.Username, OsuFont.GetFont(weight: FontWeight.Regular, italics: true)),
- new Field("submitted on", online.Submitted.ToString(@"MMMM d, yyyy"), OsuFont.GetFont(weight: FontWeight.Bold))
+ new Field("submitted", online.Submitted, OsuFont.GetFont(weight: FontWeight.Bold))
{
Margin = new MarginPadding { Top = 5 },
},
@@ -58,11 +59,11 @@ namespace osu.Game.Overlays.BeatmapSet
if (online.Ranked.HasValue)
{
- fields.Add(new Field("ranked on", online.Ranked.Value.ToString(@"MMMM d, yyyy"), OsuFont.GetFont(weight: FontWeight.Bold)));
+ fields.Add(new Field("ranked", online.Ranked.Value, OsuFont.GetFont(weight: FontWeight.Bold)));
}
else if (online.LastUpdated.HasValue)
{
- fields.Add(new Field("last updated on", online.LastUpdated.Value.ToString(@"MMMM d, yyyy"), OsuFont.GetFont(weight: FontWeight.Bold)));
+ fields.Add(new Field("last updated", online.LastUpdated.Value, OsuFont.GetFont(weight: FontWeight.Bold)));
}
}
@@ -126,6 +127,25 @@ namespace osu.Game.Overlays.BeatmapSet
},
};
}
+
+ public Field(string first, DateTimeOffset second, FontUsage secondFont)
+ {
+ AutoSizeAxes = Axes.Both;
+ Direction = FillDirection.Horizontal;
+
+ Children = new[]
+ {
+ new OsuSpriteText
+ {
+ Text = $"{first} ",
+ Font = OsuFont.GetFont(size: 13)
+ },
+ new DrawableDate(second)
+ {
+ Font = secondFont.With(size: 13)
+ }
+ };
+ }
}
}
}
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs b/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
index 382155117e..0ae8a8bef5 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
{
private readonly Box background;
- public DrawableTopScore(ScoreInfo score, int position = 1)
+ public DrawableTopScore(ScoreInfo score, int? position = 1)
{
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 9c886dfa75..f1250679c1 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -135,7 +135,8 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
new OsuSpriteText
{
Text = $@"{score.MaxCombo:N0}x",
- Font = OsuFont.GetFont(size: text_size)
+ Font = OsuFont.GetFont(size: text_size),
+ Colour = score.MaxCombo == score.Beatmap?.MaxCombo ? highAccuracyColour : Color4.White
}
};
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index 3cb77c6450..92ff3c3125 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -191,8 +191,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
scope.BindValueChanged(_ => getScores());
ruleset.BindValueChanged(_ => getScores());
- modSelector.SelectedMods.ItemsAdded += _ => getScores();
- modSelector.SelectedMods.ItemsRemoved += _ => getScores();
+ modSelector.SelectedMods.CollectionChanged += (_, __) => getScores();
Beatmap.BindValueChanged(onBeatmapChanged);
user.BindValueChanged(onUserChanged, true);
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
index 4e253018c3..9111a0cfc7 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
@@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
+using System;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@@ -12,7 +13,6 @@ using osu.Game.Graphics.Sprites;
using osu.Game.Online.Leaderboards;
using osu.Game.Scoring;
using osu.Game.Users.Drawables;
-using osu.Game.Utils;
using osuTK;
using osuTK.Graphics;
@@ -24,7 +24,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
private readonly UpdateableRank rank;
private readonly UpdateableAvatar avatar;
private readonly LinkFlowContainer usernameText;
- private readonly SpriteText date;
+ private readonly DrawableDate achievedOn;
private readonly UpdateableFlag flag;
public TopScoreUserSection()
@@ -92,11 +92,24 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
Origin = Anchor.CentreLeft,
AutoSizeAxes = Axes.Both,
},
- date = new OsuSpriteText
+ new FillFlowContainer
{
+ AutoSizeAxes = Axes.Both,
+ Direction = FillDirection.Horizontal,
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
- Font = OsuFont.GetFont(size: 10)
+ Children = new[]
+ {
+ new OsuSpriteText
+ {
+ Text = "achieved ",
+ Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold)
+ },
+ achievedOn = new DrawableDate(DateTimeOffset.MinValue)
+ {
+ Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold)
+ },
+ }
},
flag = new UpdateableFlag
{
@@ -112,9 +125,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
};
}
- public int ScorePosition
+ public int? ScorePosition
{
- set => rankText.Text = $"#{value}";
+ set => rankText.Text = value == null ? "-" : $"#{value}";
}
/// <summary>
@@ -126,7 +139,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
{
avatar.User = value.User;
flag.Country = value.User.Country;
- date.Text = $@"achieved {HumanizerUtils.Humanize(value.Date)}";
+ achievedOn.Date = value.Date;
usernameText.Clear();
usernameText.AddUserLink(value.User);
diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index 7624351e41..d29997f7e5 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -25,7 +25,8 @@ namespace osu.Game.Overlays
public const float RIGHT_WIDTH = 275;
protected readonly Header Header;
- private RulesetStore rulesets;
+ [Resolved]
+ private RulesetStore rulesets { get; set; }
private readonly Bindable<BeatmapSetInfo> beatmapSet = new Bindable<BeatmapSetInfo>();
@@ -90,10 +91,8 @@ namespace osu.Game.Overlays
}
[BackgroundDependencyLoader]
- private void load(RulesetStore rulesets)
+ private void load()
{
- this.rulesets = rulesets;
-
background.Colour = ColourProvider.Background6;
}
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index f2aef0995f..bdc241a437 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -30,7 +30,8 @@ namespace osu.Game.Overlays
private const float textbox_height = 60;
private const float channel_selection_min_height = 0.3f;
- private ChannelManager channelManager;
+ [Resolved]
+ private ChannelManager channelManager { get; set; }
private Container<DrawableChannel> currentChannelContainer;
@@ -72,7 +73,7 @@ namespace osu.Game.Overlays
}
[BackgroundDependencyLoader]
- private void load(OsuConfigManager config, OsuColour colours, ChannelManager channelManager)
+ private void load(OsuConfigManager config, OsuColour colours)
{
const float padding = 5;
@@ -209,8 +210,6 @@ namespace osu.Game.Overlays
chatBackground.Colour = colours.ChatBlue;
- this.channelManager = channelManager;
-
loading.Show();
// This is a relatively expensive (and blocking) operation.
diff --git a/osu.Game/Overlays/Comments/CommentsHeader.cs b/osu.Game/Overlays/Comments/CommentsHeader.cs
index ad80e67330..1aa40201f1 100644
--- a/osu.Game/Overlays/Comments/CommentsHeader.cs
+++ b/osu.Game/Overlays/Comments/CommentsHeader.cs
@@ -16,8 +16,6 @@ namespace osu.Game.Overlays.Comments
{
public class CommentsHeader : CompositeDrawable
{
- private const int font_size = 14;
-
public readonly Bindable<CommentsSortCriteria> Sort = new Bindable<CommentsSortCriteria>();
public readonly BindableBool ShowDeleted = new BindableBool();
@@ -40,29 +38,11 @@ namespace osu.Game.Overlays.Comments
Padding = new MarginPadding { Horizontal = 50 },
Children = new Drawable[]
{
- new FillFlowContainer
+ new OverlaySortTabControl<CommentsSortCriteria>
{
- AutoSizeAxes = Axes.Both,
- Direction = FillDirection.Horizontal,
- Spacing = new Vector2(10, 0),
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
- Children = new Drawable[]
- {
- new OsuSpriteText
- {
- Anchor = Anchor.CentreLeft,
- Origin = Anchor.CentreLeft,
- Font = OsuFont.GetFont(size: font_size),
- Text = @"Sort by"
- },
- new SortTabControl
- {
- Anchor = Anchor.CentreLeft,
- Origin = Anchor.CentreLeft,
- Current = Sort
- }
- }
+ Current = Sort
},
new ShowDeletedButton
{
@@ -106,7 +86,7 @@ namespace osu.Game.Overlays.Comments
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
- Font = OsuFont.GetFont(size: font_size),
+ Font = OsuFont.GetFont(size: 12),
Text = @"Show deleted"
}
},
@@ -126,4 +106,11 @@ namespace osu.Game.Overlays.Comments
}
}
}
+
+ public enum CommentsSortCriteria
+ {
+ New,
+ Old,
+ Top
+ }
}
diff --git a/osu.Game/Overlays/Comments/SortTabControl.cs b/osu.Game/Overlays/Comments/SortTabControl.cs
deleted file mode 100644
index 700d63351f..0000000000
--- a/osu.Game/Overlays/Comments/SortTabControl.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics;
-using osuTK;
-using osu.Game.Graphics.UserInterface;
-using osu.Framework.Input.Events;
-using osu.Framework.Bindables;
-using osu.Framework.Allocation;
-using osu.Game.Graphics.Sprites;
-using osuTK.Graphics;
-
-namespace osu.Game.Overlays.Comments
-{
- public class SortTabControl : OsuTabControl<CommentsSortCriteria>
- {
- protected override Dropdown<CommentsSortCriteria> CreateDropdown() => null;
-
- protected override TabItem<CommentsSortCriteria> CreateTabItem(CommentsSortCriteria value) => new SortTabItem(value);
-
- protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
- {
- AutoSizeAxes = Axes.Both,
- Direction = FillDirection.Horizontal,
- Spacing = new Vector2(5, 0),
- };
-
- public SortTabControl()
- {
- AutoSizeAxes = Axes.Both;
- }
-
- private class SortTabItem : TabItem<CommentsSortCriteria>
- {
- public SortTabItem(CommentsSortCriteria value)
- : base(value)
- {
- AutoSizeAxes = Axes.Both;
- Child = new TabButton(value) { Active = { BindTarget = Active } };
- }
-
- protected override void OnActivated()
- {
- }
-
- protected override void OnDeactivated()
- {
- }
-
- private class TabButton : HeaderButton
- {
- public readonly BindableBool Active = new BindableBool();
-
- [Resolved]
- private OverlayColourProvider colourProvider { get; set; }
-
- private readonly SpriteText text;
-
- public TabButton(CommentsSortCriteria value)
- {
- Add(text = new OsuSpriteText
- {
- Font = OsuFont.GetFont(size: 14),
- Text = value.ToString()
- });
- }
-
- protected override void LoadComplete()
- {
- base.LoadComplete();
-
- Active.BindValueChanged(active =>
- {
- updateBackgroundState();
-
- text.Font = text.Font.With(weight: active.NewValue ? FontWeight.Bold : FontWeight.Medium);
- text.Colour = active.NewValue ? colourProvider.Light1 : Color4.White;
- }, true);
- }
-
- protected override bool OnHover(HoverEvent e)
- {
- updateBackgroundState();
- return true;
- }
-
- protected override void OnHoverLost(HoverLostEvent e) => updateBackgroundState();
-
- private void updateBackgroundState()
- {
- if (Active.Value || IsHovered)
- ShowBackground();
- else
- HideBackground();
- }
- }
- }
- }
-
- public enum CommentsSortCriteria
- {
- New,
- Old,
- Top
- }
-}
diff --git a/osu.Game/Overlays/Direct/FilterControl.cs b/osu.Game/Overlays/Direct/FilterControl.cs
index 8b04bf0387..70a3ab54fb 100644
--- a/osu.Game/Overlays/Direct/FilterControl.cs
+++ b/osu.Game/Overlays/Direct/FilterControl.cs
@@ -34,14 +34,13 @@ namespace osu.Game.Overlays.Direct
public enum DirectSortCriteria
{
- Relevance,
Title,
Artist,
- Creator,
Difficulty,
Ranked,
Rating,
Plays,
Favourites,
+ Relevance,
}
}
diff --git a/osu.Game/Overlays/Direct/PanelDownloadButton.cs b/osu.Game/Overlays/Direct/PanelDownloadButton.cs
index ed44f1e960..1b3657f010 100644
--- a/osu.Game/Overlays/Direct/PanelDownloadButton.cs
+++ b/osu.Game/Overlays/Direct/PanelDownloadButton.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Overlays.Direct
[BackgroundDependencyLoader(true)]
private void load(OsuGame game, BeatmapManager beatmaps)
{
- if (BeatmapSet.Value.OnlineInfo.Availability?.DownloadDisabled ?? false)
+ if (BeatmapSet.Value?.OnlineInfo?.Availability?.DownloadDisabled ?? false)
{
button.Enabled.Value = false;
button.TooltipText = "this beatmap is currently not available for download.";
@@ -62,7 +62,7 @@ namespace osu.Game.Overlays.Direct
break;
case DownloadState.LocallyAvailable:
- game.PresentBeatmap(BeatmapSet.Value);
+ game?.PresentBeatmap(BeatmapSet.Value);
break;
default:
diff --git a/osu.Game/Overlays/Direct/PlayButton.cs b/osu.Game/Overlays/Direct/PlayButton.cs
index 2a77e7ca26..10abe15177 100644
--- a/osu.Game/Overlays/Direct/PlayButton.cs
+++ b/osu.Game/Overlays/Direct/PlayButton.cs
@@ -85,13 +85,12 @@ namespace osu.Game.Overlays.Direct
Playing.ValueChanged += playingStateChanged;
}
- private PreviewTrackManager previewTrackManager;
+ [Resolved]
+ private PreviewTrackManager previewTrackManager { get; set; }
[BackgroundDependencyLoader]
- private void load(OsuColour colour, PreviewTrackManager previewTrackManager)
+ private void load(OsuColour colour)
{
- this.previewTrackManager = previewTrackManager;
-
hoverColour = colour.Yellow;
}
diff --git a/osu.Game/Overlays/DirectOverlay.cs b/osu.Game/Overlays/DirectOverlay.cs
index e4cef319fe..a6f8b65a0d 100644
--- a/osu.Game/Overlays/DirectOverlay.cs
+++ b/osu.Game/Overlays/DirectOverlay.cs
@@ -27,7 +27,8 @@ namespace osu.Game.Overlays
{
private const float panel_padding = 10f;
- private RulesetStore rulesets;
+ [Resolved]
+ private RulesetStore rulesets { get; set; }
private readonly FillFlowContainer resultCountsContainer;
private readonly OsuSpriteText resultCountsText;
@@ -155,11 +156,8 @@ namespace osu.Game.Overlays
}
[BackgroundDependencyLoader]
- private void load(OsuColour colours, RulesetStore rulesets, PreviewTrackManager previewTrackManager)
+ private void load(OsuColour colours)
{
- this.rulesets = rulesets;
- this.previewTrackManager = previewTrackManager;
-
resultCountsContainer.Colour = colours.Yellow;
}
@@ -228,7 +226,9 @@ namespace osu.Game.Overlays
private readonly Bindable<string> currentQuery = new Bindable<string>(string.Empty);
private ScheduledDelegate queryChangedDebounce;
- private PreviewTrackManager previewTrackManager;
+
+ [Resolved]
+ private PreviewTrackManager previewTrackManager { get; set; }
private void queueUpdateSearch(bool queryTextChanged = false)
{
diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index d2fcc2652a..58ca2143f9 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -66,13 +66,12 @@ namespace osu.Game.Overlays.KeyBinding
CornerRadius = padding;
}
- private KeyBindingStore store;
+ [Resolved]
+ private KeyBindingStore store { get; set; }
[BackgroundDependencyLoader]
- private void load(OsuColour colours, KeyBindingStore store)
+ private void load(OsuColour colours)
{
- this.store = store;
-
EdgeEffect = new EdgeEffectParameters
{
Radius = 2,
diff --git a/osu.Game/Overlays/Music/Playlist.cs b/osu.Game/Overlays/Music/Playlist.cs
index 1ba568443d..621a533dd6 100644
--- a/osu.Game/Overlays/Music/Playlist.cs
+++ b/osu.Game/Overlays/Music/Playlist.cs
@@ -12,17 +12,12 @@ using osuTK;
namespace osu.Game.Overlays.Music
{
- public class Playlist : RearrangeableListContainer<BeatmapSetInfo>
+ public class Playlist : OsuRearrangeableListContainer<BeatmapSetInfo>
{
public Action<BeatmapSetInfo> RequestSelection;
public readonly Bindable<BeatmapSetInfo> SelectedSet = new Bindable<BeatmapSetInfo>();
- /// <summary>
- /// Whether any item is currently being dragged. Used to hide other items' drag handles.
- /// </summary>
- private readonly BindableBool playlistDragActive = new BindableBool();
-
public new MarginPadding Padding
{
get => base.Padding;
@@ -33,15 +28,12 @@ namespace osu.Game.Overlays.Music
public BeatmapSetInfo FirstVisibleSet => Items.FirstOrDefault(i => ((PlaylistItem)ItemMap[i]).MatchingFilter);
- protected override RearrangeableListItem<BeatmapSetInfo> CreateDrawable(BeatmapSetInfo item) => new PlaylistItem(item)
+ protected override OsuRearrangeableListItem<BeatmapSetInfo> CreateOsuDrawable(BeatmapSetInfo item) => new PlaylistItem(item)
{
SelectedSet = { BindTarget = SelectedSet },
- PlaylistDragActive = { BindTarget = playlistDragActive },
RequestSelection = set => RequestSelection?.Invoke(set)
};
- protected override ScrollContainer<Drawable> CreateScrollContainer() => new OsuScrollContainer();
-
protected override FillFlowContainer<RearrangeableListItem<BeatmapSetInfo>> CreateListFillFlowContainer() => new SearchContainer<RearrangeableListItem<BeatmapSetInfo>>
{
Spacing = new Vector2(0, 3),
diff --git a/osu.Game/Overlays/Music/PlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs
index 0569261867..de2f916946 100644
--- a/osu.Game/Overlays/Music/PlaylistItem.cs
+++ b/osu.Game/Overlays/Music/PlaylistItem.cs
@@ -14,36 +14,28 @@ using osu.Framework.Localisation;
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
-using osuTK;
using osuTK.Graphics;
namespace osu.Game.Overlays.Music
{
- public class PlaylistItem : RearrangeableListItem<BeatmapSetInfo>, IFilterable
+ public class PlaylistItem : OsuRearrangeableListItem<BeatmapSetInfo>, IFilterable
{
- private const float fade_duration = 100;
-
- public BindableBool PlaylistDragActive = new BindableBool();
-
public readonly Bindable<BeatmapSetInfo> SelectedSet = new Bindable<BeatmapSetInfo>();
public Action<BeatmapSetInfo> RequestSelection;
- private PlaylistItemHandle handle;
private TextFlowContainer text;
private IEnumerable<Drawable> titleSprites;
- private ILocalisedBindableString titleBind;
- private ILocalisedBindableString artistBind;
- private Color4 hoverColour;
+ private ILocalisedBindableString title;
+ private ILocalisedBindableString artist;
+
+ private Color4 selectedColour;
private Color4 artistColour;
public PlaylistItem(BeatmapSetInfo item)
: base(item)
{
- RelativeSizeAxes = Axes.X;
- AutoSizeAxes = Axes.Y;
-
Padding = new MarginPadding { Left = 5 };
FilterTerms = item.Metadata.SearchableTerms;
@@ -52,66 +44,44 @@ namespace osu.Game.Overlays.Music
[BackgroundDependencyLoader]
private void load(OsuColour colours, LocalisationManager localisation)
{
- hoverColour = colours.Yellow;
+ selectedColour = colours.Yellow;
artistColour = colours.Gray9;
+ HandleColour = colours.Gray5;
- InternalChild = new GridContainer
- {
- RelativeSizeAxes = Axes.X,
- AutoSizeAxes = Axes.Y,
- Content = new[]
- {
- new Drawable[]
- {
- handle = new PlaylistItemHandle
- {
- Anchor = Anchor.CentreLeft,
- Origin = Anchor.CentreLeft,
- Size = new Vector2(12),
- Colour = colours.Gray5,
- AlwaysPresent = true,
- Alpha = 0
- },
- text = new OsuTextFlowContainer
- {
- RelativeSizeAxes = Axes.X,
- AutoSizeAxes = Axes.Y,
- Padding = new MarginPadding { Left = 5 },
- },
- }
- },
- ColumnDimensions = new[] { new Dimension(GridSizeMode.AutoSize) },
- RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
- };
-
- titleBind = localisation.GetLocalisedString(new LocalisedString((Model.Metadata.TitleUnicode, Model.Metadata.Title)));
- artistBind = localisation.GetLocalisedString(new LocalisedString((Model.Metadata.ArtistUnicode, Model.Metadata.Artist)));
-
- artistBind.BindValueChanged(_ => recreateText(), true);
+ title = localisation.GetLocalisedString(new LocalisedString((Model.Metadata.TitleUnicode, Model.Metadata.Title)));
+ artist = localisation.GetLocalisedString(new LocalisedString((Model.Metadata.ArtistUnicode, Model.Metadata.Artist)));
}
protected override void LoadComplete()
{
base.LoadComplete();
+ artist.BindValueChanged(_ => recreateText(), true);
+
SelectedSet.BindValueChanged(set =>
{
- if (set.OldValue != Model && set.NewValue != Model)
+ if (set.OldValue?.Equals(Model) != true && set.NewValue?.Equals(Model) != true)
return;
foreach (Drawable s in titleSprites)
- s.FadeColour(set.NewValue == Model ? hoverColour : Color4.White, fade_duration);
+ s.FadeColour(set.NewValue.Equals(Model) ? selectedColour : Color4.White, FADE_DURATION);
}, true);
}
+ protected override Drawable CreateContent() => text = new OsuTextFlowContainer
+ {
+ RelativeSizeAxes = Axes.X,
+ AutoSizeAxes = Axes.Y,
+ };
+
private void recreateText()
{
text.Clear();
//space after the title to put a space between the title and artist
- titleSprites = text.AddText(titleBind.Value + @" ", sprite => sprite.Font = OsuFont.GetFont(weight: FontWeight.Regular)).OfType<SpriteText>();
+ titleSprites = text.AddText(title.Value + @" ", sprite => sprite.Font = OsuFont.GetFont(weight: FontWeight.Regular)).OfType<SpriteText>();
- text.AddText(artistBind.Value, sprite =>
+ text.AddText(artist.Value, sprite =>
{
sprite.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold);
sprite.Colour = artistColour;
@@ -125,31 +95,6 @@ namespace osu.Game.Overlays.Music
return true;
}
- protected override bool OnDragStart(DragStartEvent e)
- {
- if (!base.OnDragStart(e))
- return false;
-
- PlaylistDragActive.Value = true;
- return true;
- }
-
- protected override void OnDragEnd(DragEndEvent e)
- {
- PlaylistDragActive.Value = false;
- base.OnDragEnd(e);
- }
-
- protected override bool IsDraggableAt(Vector2 screenSpacePos) => handle.HandlingDrag;
-
- protected override bool OnHover(HoverEvent e)
- {
- handle.UpdateHoverState(IsDragged || !PlaylistDragActive.Value);
- return base.OnHover(e);
- }
-
- protected override void OnHoverLost(HoverLostEvent e) => handle.UpdateHoverState(false);
-
public IEnumerable<string> FilterTerms { get; }
private bool matching = true;
@@ -168,44 +113,5 @@ namespace osu.Game.Overlays.Music
}
public bool FilteringActive { get; set; }
-
- private class PlaylistItemHandle : SpriteIcon
- {
- public bool HandlingDrag { get; private set; }
- private bool isHovering;
-
- public PlaylistItemHandle()
- {
- Icon = FontAwesome.Solid.Bars;
- }
-
- protected override bool OnMouseDown(MouseDownEvent e)
- {
- base.OnMouseDown(e);
-
- HandlingDrag = true;
- UpdateHoverState(isHovering);
-
- return false;
- }
-
- protected override void OnMouseUp(MouseUpEvent e)
- {
- base.OnMouseUp(e);
-
- HandlingDrag = false;
- UpdateHoverState(isHovering);
- }
-
- public void UpdateHoverState(bool hovering)
- {
- isHovering = hovering;
-
- if (isHovering || HandlingDrag)
- this.FadeIn(fade_duration);
- else
- this.FadeOut(fade_duration);
- }
- }
}
}
diff --git a/osu.Game/Overlays/Music/PlaylistOverlay.cs b/osu.Game/Overlays/Music/PlaylistOverlay.cs
index 7c391e27f9..b878aba489 100644
--- a/osu.Game/Overlays/Music/PlaylistOverlay.cs
+++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs
@@ -26,16 +26,17 @@ namespace osu.Game.Overlays.Music
private readonly BindableList<BeatmapSetInfo> beatmapSets = new BindableList<BeatmapSetInfo>();
private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
- private BeatmapManager beatmaps;
+
+ [Resolved]
+ private BeatmapManager beatmaps { get; set; }
private FilterControl filter;
private Playlist list;
[BackgroundDependencyLoader]
- private void load(OsuColour colours, Bindable<WorkingBeatmap> beatmap, BeatmapManager beatmaps)
+ private void load(OsuColour colours, Bindable<WorkingBeatmap> beatmap)
{
this.beatmap.BindTo(beatmap);
- this.beatmaps = beatmaps;
Children = new Drawable[]
{
@@ -74,8 +75,6 @@ namespace osu.Game.Overlays.Music
},
};
- list.Items.BindTo(beatmapSets);
-
filter.Search.OnCommit = (sender, newText) =>
{
BeatmapInfo toSelect = list.FirstVisibleSet?.Beatmaps?.FirstOrDefault();
@@ -86,7 +85,13 @@ namespace osu.Game.Overlays.Music
beatmap.Value.Track.Restart();
}
};
+ }
+ protected override void LoadComplete()
+ {
+ base.LoadComplete();
+
+ list.Items.BindTo(beatmapSets);
beatmap.BindValueChanged(working => list.SelectedSet.Value = working.NewValue.BeatmapSetInfo, true);
}
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 7c7daf6eb9..d788929739 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -25,7 +25,16 @@ namespace osu.Game.Overlays
[Resolved]
private BeatmapManager beatmaps { get; set; }
- public IBindableList<BeatmapSetInfo> BeatmapSets => beatmapSets;
+ public IBindableList<BeatmapSetInfo> BeatmapSets
+ {
+ get
+ {
+ if (LoadState < LoadState.Ready)
+ throw new InvalidOperationException($"{nameof(BeatmapSets)} should not be accessed before the music controller is loaded.");
+
+ return beatmapSets;
+ }
+ }
/// <summary>
/// Point in time after which the current track will be restarted on triggering a "previous track" action.
@@ -54,16 +63,18 @@ namespace osu.Game.Overlays
[BackgroundDependencyLoader]
private void load()
{
- beatmapSets.AddRange(beatmaps.GetAllUsableBeatmapSets().OrderBy(_ => RNG.Next()));
beatmaps.ItemAdded += handleBeatmapAdded;
beatmaps.ItemRemoved += handleBeatmapRemoved;
+
+ beatmapSets.AddRange(beatmaps.GetAllUsableBeatmapSets().OrderBy(_ => RNG.Next()));
}
protected override void LoadComplete()
{
+ base.LoadComplete();
+
beatmap.BindValueChanged(beatmapChanged, true);
mods.BindValueChanged(_ => ResetTrackAdjustments(), true);
- base.LoadComplete();
}
/// <summary>
@@ -82,11 +93,16 @@ namespace osu.Game.Overlays
/// </summary>
public bool IsPlaying => current?.Track.IsRunning ?? false;
- private void handleBeatmapAdded(BeatmapSetInfo set) =>
- Schedule(() => beatmapSets.Add(set));
+ private void handleBeatmapAdded(BeatmapSetInfo set) => Schedule(() =>
+ {
+ if (!beatmapSets.Contains(set))
+ beatmapSets.Add(set);
+ });
- private void handleBeatmapRemoved(BeatmapSetInfo set) =>
- Schedule(() => beatmapSets.RemoveAll(s => s.ID == set.ID));
+ private void handleBeatmapRemoved(BeatmapSetInfo set) => Schedule(() =>
+ {
+ beatmapSets.RemoveAll(s => s.ID == set.ID);
+ });
private ScheduledDelegate seekDelegate;
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index dfcf99d30c..118cb037cb 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -58,6 +58,9 @@ namespace osu.Game.Overlays
[Resolved]
private Bindable<WorkingBeatmap> beatmap { get; set; }
+ [Resolved]
+ private OsuColour colours { get; set; }
+
public NowPlayingOverlay()
{
Width = 400;
@@ -65,7 +68,7 @@ namespace osu.Game.Overlays
}
[BackgroundDependencyLoader]
- private void load(OsuColour colours)
+ private void load()
{
Children = new Drawable[]
{
@@ -182,15 +185,15 @@ namespace osu.Game.Overlays
}
}
};
-
- playlist.BeatmapSets.BindTo(musicController.BeatmapSets);
- playlist.State.ValueChanged += s => playlistButton.FadeColour(s.NewValue == Visibility.Visible ? colours.Yellow : Color4.White, 200, Easing.OutQuint);
}
protected override void LoadComplete()
{
base.LoadComplete();
+ playlist.BeatmapSets.BindTo(musicController.BeatmapSets);
+ playlist.State.BindValueChanged(s => playlistButton.FadeColour(s.NewValue == Visibility.Visible ? colours.Yellow : Color4.White, 200, Easing.OutQuint), true);
+
beatmap.BindDisabledChanged(beatmapDisabledChanged, true);
musicController.TrackChanged += trackChanged;
diff --git a/osu.Game/Overlays/OverlaySortTabControl.cs b/osu.Game/Overlays/OverlaySortTabControl.cs
new file mode 100644
index 0000000000..5a713ab08e
--- /dev/null
+++ b/osu.Game/Overlays/OverlaySortTabControl.cs
@@ -0,0 +1,168 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osuTK;
+using osu.Game.Graphics.UserInterface;
+using osu.Framework.Input.Events;
+using osu.Framework.Bindables;
+using osu.Framework.Allocation;
+using osu.Game.Graphics.Sprites;
+using osuTK.Graphics;
+using osu.Game.Overlays.Comments;
+using JetBrains.Annotations;
+
+namespace osu.Game.Overlays
+{
+ public class OverlaySortTabControl<T> : CompositeDrawable, IHasCurrentValue<T>
+ {
+ private readonly BindableWithCurrent<T> current = new BindableWithCurrent<T>();
+
+ public Bindable<T> Current
+ {
+ get => current.Current;
+ set => current.Current = value;
+ }
+
+ public OverlaySortTabControl()
+ {
+ AutoSizeAxes = Axes.Both;
+ AddInternal(new FillFlowContainer
+ {
+ AutoSizeAxes = Axes.Both,
+ Direction = FillDirection.Horizontal,
+ Spacing = new Vector2(10, 0),
+ Children = new Drawable[]
+ {
+ new OsuSpriteText
+ {
+ Anchor = Anchor.CentreLeft,
+ Origin = Anchor.CentreLeft,
+ Font = OsuFont.GetFont(size: 12),
+ Text = @"Sort by"
+ },
+ CreateControl().With(c =>
+ {
+ c.Anchor = Anchor.CentreLeft;
+ c.Origin = Anchor.CentreLeft;
+ c.Current = current;
+ })
+ }
+ });
+ }
+
+ [NotNull]
+ protected virtual SortTabControl CreateControl() => new SortTabControl();
+
+ protected class SortTabControl : OsuTabControl<T>
+ {
+ protected override Dropdown<T> CreateDropdown() => null;
+
+ protected override TabItem<T> CreateTabItem(T value) => new SortTabItem(value);
+
+ protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
+ {
+ AutoSizeAxes = Axes.Both,
+ Direction = FillDirection.Horizontal,
+ Spacing = new Vector2(5, 0),
+ };
+
+ public SortTabControl()
+ {
+ AutoSizeAxes = Axes.Both;
+ }
+ }
+
+ protected class SortTabItem : TabItem<T>
+ {
+ public SortTabItem(T value)
+ : base(value)
+ {
+ AutoSizeAxes = Axes.Both;
+ Child = CreateTabButton(value);
+ }
+
+ [NotNull]
+ protected virtual TabButton CreateTabButton(T value) => new TabButton(value)
+ {
+ Active = { BindTarget = Active }
+ };
+
+ protected override void OnActivated()
+ {
+ }
+
+ protected override void OnDeactivated()
+ {
+ }
+ }
+
+ protected class TabButton : HeaderButton
+ {
+ public readonly BindableBool Active = new BindableBool();
+
+ protected override Container<Drawable> Content => content;
+
+ protected virtual Color4 ContentColour
+ {
+ set => text.Colour = value;
+ }
+
+ [Resolved]
+ private OverlayColourProvider colourProvider { get; set; }
+
+ private readonly SpriteText text;
+ private readonly FillFlowContainer content;
+
+ public TabButton(T value)
+ {
+ base.Content.Add(content = new FillFlowContainer
+ {
+ AutoSizeAxes = Axes.Both,
+ Direction = FillDirection.Horizontal,
+ Spacing = new Vector2(3, 0),
+ Children = new Drawable[]
+ {
+ text = new OsuSpriteText
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ Font = OsuFont.GetFont(size: 12),
+ Text = value.ToString()
+ }
+ }
+ });
+ }
+
+ protected override void LoadComplete()
+ {
+ base.LoadComplete();
+ Active.BindValueChanged(_ => UpdateState(), true);
+ }
+
+ protected override bool OnHover(HoverEvent e)
+ {
+ UpdateState();
+ return true;
+ }
+
+ protected override void OnHoverLost(HoverLostEvent e) => UpdateState();
+
+ protected virtual void UpdateState()
+ {
+ if (Active.Value || IsHovered)
+ ShowBackground();
+ else
+ HideBackground();
+
+ ContentColour = Active.Value && !IsHovered ? colourProvider.Light1 : Color4.White;
+
+ text.Font = text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.Medium);
+ }
+ }
+ }
+}
diff --git a/osu.Game/Overlays/Profile/Sections/CounterPill.cs b/osu.Game/Overlays/Profile/Sections/CounterPill.cs
index bd760c4139..52adefa4ad 100644
--- a/osu.Game/Overlays/Profile/Sections/CounterPill.cs
+++ b/osu.Game/Overlays/Profile/Sections/CounterPill.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using osu.Framework.Bindables;
using osu.Game.Graphics.Sprites;
+using osu.Framework.Allocation;
namespace osu.Game.Overlays.Profile.Sections
{
@@ -16,9 +17,10 @@ namespace osu.Game.Overlays.Profile.Sections
public readonly BindableInt Current = new BindableInt();
- private readonly OsuSpriteText counter;
+ private OsuSpriteText counter;
- public CounterPill()
+ [BackgroundDependencyLoader]
+ private void load(OverlayColourProvider colourProvider)
{
AutoSizeAxes = Axes.Both;
Alpha = 0;
@@ -28,14 +30,15 @@ namespace osu.Game.Overlays.Profile.Sections
new Box
{
RelativeSizeAxes = Axes.Both,
- Colour = OsuColour.Gray(0.05f)
+ Colour = colourProvider.Background6
},
counter = new OsuSpriteText
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Margin = new MarginPadding { Horizontal = 10, Vertical = 5 },
- Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold)
+ Font = OsuFont.GetFont(weight: FontWeight.Bold),
+ Colour = colourProvider.Foreground1
}
};
}
@@ -54,7 +57,7 @@ namespace osu.Game.Overlays.Profile.Sections
return;
}
- counter.Text = value.NewValue.ToString();
+ counter.Text = value.NewValue.ToString("N0");
this.FadeIn(duration, Easing.OutQuint);
}
}
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index 0eee34a304..2c20dcc0ef 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -1,7 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-using System;
using System.Linq;
using JetBrains.Annotations;
using osu.Framework.Allocation;
@@ -22,10 +21,9 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
public class DrawableProfileScore : CompositeDrawable
{
private const int height = 40;
- private const int performance_width = 80;
+ private const int performance_width = 100;
private const float performance_background_shear = 0.45f;
- private static readonly float performance_background_width = performance_width + (height / 4f * MathF.Tan(performance_background_shear));
protected readonly ScoreInfo Score;
@@ -53,7 +51,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
new Container
{
RelativeSizeAxes = Axes.Both,
- Padding = new MarginPadding { Left = 10, Right = performance_width + 30 },
+ Padding = new MarginPadding { Left = 20, Right = performance_width },
Children = new Drawable[]
{
new FillFlowContainer
@@ -62,7 +60,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
Origin = Anchor.CentreLeft,
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
- Spacing = new Vector2(8, 0),
+ Spacing = new Vector2(10, 0),
Children = new Drawable[]
{
new UpdateableRank(Score.Rank)
@@ -85,7 +83,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
{
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
- Spacing = new Vector2(5, 0),
+ Spacing = new Vector2(15, 0),
Children = new Drawable[]
{
new OsuSpriteText
@@ -108,16 +106,21 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
{
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
- AutoSizeAxes = Axes.Both,
+ AutoSizeAxes = Axes.X,
+ RelativeSizeAxes = Axes.Y,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(15),
- Children = new[]
+ Children = new Drawable[]
{
- CreateRightContent().With(c =>
+ new Container
{
- c.Anchor = Anchor.CentreRight;
- c.Origin = Anchor.CentreRight;
- }),
+ AutoSizeAxes = Axes.X,
+ RelativeSizeAxes = Axes.Y,
+ Padding = new MarginPadding { Horizontal = 10, Vertical = 5 },
+ Anchor = Anchor.CentreRight,
+ Origin = Anchor.CentreRight,
+ Child = CreateRightContent()
+ },
new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
@@ -140,14 +143,13 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
Width = performance_width,
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
- Children = new[]
+ Children = new Drawable[]
{
new Box
{
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
- RelativeSizeAxes = Axes.Y,
- Width = performance_background_width,
+ RelativeSizeAxes = Axes.Both,
Height = 0.5f,
Colour = colourProvider.Background4,
Shear = new Vector2(-performance_background_shear, 0),
@@ -157,20 +159,29 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
{
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
- RelativeSizeAxes = Axes.Y,
+ RelativeSizeAxes = Axes.Both,
RelativePositionAxes = Axes.Y,
- Width = performance_background_width,
Height = -0.5f,
Position = new Vector2(0, 1),
Colour = colourProvider.Background4,
Shear = new Vector2(performance_background_shear, 0),
EdgeSmoothness = new Vector2(2, 0),
},
- createDrawablePerformance().With(d =>
+ new Container
{
- d.Anchor = Anchor.Centre;
- d.Origin = Anchor.Centre;
- })
+ RelativeSizeAxes = Axes.Both,
+ Padding = new MarginPadding
+ {
+ Vertical = 5,
+ Left = 30,
+ Right = 20
+ },
+ Child = createDrawablePerformance().With(d =>
+ {
+ d.Anchor = Anchor.Centre;
+ d.Origin = Anchor.Centre;
+ })
+ }
}
}
}
@@ -180,11 +191,18 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
[NotNull]
protected virtual Drawable CreateRightContent() => CreateDrawableAccuracy();
- protected OsuSpriteText CreateDrawableAccuracy() => new OsuSpriteText
+ protected Drawable CreateDrawableAccuracy() => new Container
{
- Text = Score.DisplayAccuracy,
- Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
- Colour = colours.Yellow,
+ Width = 65,
+ RelativeSizeAxes = Axes.Y,
+ Child = new OsuSpriteText
+ {
+ Text = Score.DisplayAccuracy,
+ Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
+ Colour = colours.Yellow,
+ Anchor = Anchor.CentreLeft,
+ Origin = Anchor.CentreLeft
+ }
};
private Drawable createDrawablePerformance()
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs
index e741c88aeb..3afa79e59e 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Scoring;
+using osuTK;
namespace osu.Game.Overlays.Profile.Sections.Ranks
{
@@ -23,25 +24,28 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
{
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Vertical,
+ Origin = Anchor.CentreLeft,
+ Anchor = Anchor.CentreLeft,
Children = new Drawable[]
{
new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
- Children = new Drawable[]
+ Spacing = new Vector2(10, 0),
+ Children = new[]
{
+ CreateDrawableAccuracy(),
new Container
{
AutoSizeAxes = Axes.Y,
- Width = 60,
- Child = CreateDrawableAccuracy()
- },
- new OsuSpriteText
- {
- Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
- Text = $"{Score.PP * weight:0}pp",
- },
+ Width = 50,
+ Child = new OsuSpriteText
+ {
+ Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
+ Text = $"{Score.PP * weight:0}pp",
+ },
+ }
}
},
new OsuSpriteText
diff --git a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
index 2674b3a81e..a89360bd3c 100644
--- a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
+++ b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
@@ -11,23 +11,21 @@ namespace osu.Game.Overlays.Rankings
{
public class RankingsOverlayHeader : TabControlOverlayHeader<RankingsScope>
{
- public readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
- public readonly Bindable<Country> Country = new Bindable<Country>();
+ public Bindable<RulesetInfo> Ruleset => rulesetSelector.Current;
+
+ public Bindable<Country> Country => countryFilter.Current;
+
+ private OverlayRulesetSelector rulesetSelector;
+ private CountryFilter countryFilter;
protected override ScreenTitle CreateTitle() => new RankingsTitle
{
Scope = { BindTarget = Current }
};
- protected override Drawable CreateTitleContent() => new OverlayRulesetSelector
- {
- Current = Ruleset
- };
+ protected override Drawable CreateTitleContent() => rulesetSelector = new OverlayRulesetSelector();
- protected override Drawable CreateContent() => new CountryFilter
- {
- Current = Country
- };
+ protected override Drawable CreateContent() => countryFilter = new CountryFilter();
private class RankingsTitle : ScreenTitle
{
diff --git a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
index 33811cc982..e609fa1487 100644
--- a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Overlays.Rankings
private void getSpotlights()
{
spotlightsRequest = new GetSpotlightsRequest();
- spotlightsRequest.Success += response => selector.Spotlights = response.Spotlights;
+ spotlightsRequest.Success += response => Schedule(() => selector.Spotlights = response.Spotlights);
api.Queue(spotlightsRequest);
}
@@ -151,11 +151,11 @@ namespace osu.Game.Overlays.Rankings
protected override void Dispose(bool isDisposing)
{
- base.Dispose(isDisposing);
-
spotlightsRequest?.Cancel();
getRankingsRequest?.Cancel();
cancellationToken?.Cancel();
+
+ base.Dispose(isDisposing);
}
}
}
diff --git a/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs b/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
index a0e4f694bd..0b9a48ce0e 100644
--- a/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
@@ -8,6 +8,8 @@ using osu.Game.Users;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics;
using System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Game.Graphics.Containers;
namespace osu.Game.Overlays.Rankings.Tables
{
@@ -30,11 +32,7 @@ namespace osu.Game.Overlays.Rankings.Tables
protected override Country GetCountry(CountryStatistics item) => item.Country;
- protected override Drawable CreateFlagContent(CountryStatistics item) => new OsuSpriteText
- {
- Font = OsuFont.GetFont(size: TEXT_SIZE),
- Text = $@"{item.Country.FullName}",
- };
+ protected override Drawable CreateFlagContent(CountryStatistics item) => new CountryName(item.Country);
protected override Drawable[] CreateAdditionalContent(CountryStatistics item) => new Drawable[]
{
@@ -63,5 +61,37 @@ namespace osu.Game.Overlays.Rankings.Tables
Text = $@"{item.Performance / Math.Max(item.ActiveUsers, 1):N0}",
}
};
+
+ private class CountryName : OsuHoverContainer
+ {
+ protected override IEnumerable<Drawable> EffectTargets => new[] { text };
+
+ [Resolved(canBeNull: true)]
+ private RankingsOverlay rankings { get; set; }
+
+ private readonly OsuSpriteText text;
+ private readonly Country country;
+
+ public CountryName(Country country)
+ {
+ this.country = country;
+
+ AutoSizeAxes = Axes.Both;
+ Add(text = new OsuSpriteText
+ {
+ Font = OsuFont.GetFont(size: 12),
+ Text = country.FullName ?? string.Empty,
+ });
+ }
+
+ [BackgroundDependencyLoader]
+ private void load(OverlayColourProvider colourProvider)
+ {
+ IdleColour = colourProvider.Light2;
+ HoverColour = colourProvider.Content2;
+
+ Action = () => rankings?.ShowCountry(country);
+ }
+ }
}
}
diff --git a/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs b/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
index 0e77d7d764..cad7364103 100644
--- a/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Rankings.Tables
protected sealed override Drawable CreateFlagContent(UserStatistics item)
{
- var username = new LinkFlowContainer(t => t.Font = OsuFont.GetFont(size: TEXT_SIZE)) { AutoSizeAxes = Axes.Both };
+ var username = new LinkFlowContainer(t => t.Font = OsuFont.GetFont(size: TEXT_SIZE, italics: true)) { AutoSizeAxes = Axes.Both };
username.AddUserLink(item.User);
return username;
}
diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index f3215d07fa..2c5ea61315 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -19,14 +19,17 @@ namespace osu.Game.Overlays
{
public class RankingsOverlay : FullscreenOverlay
{
- protected readonly Bindable<Country> Country = new Bindable<Country>();
- protected readonly Bindable<RankingsScope> Scope = new Bindable<RankingsScope>();
- private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
+ protected Bindable<Country> Country => header.Country;
+
+ protected Bindable<RankingsScope> Scope => header.Current;
+
+ private Bindable<RulesetInfo> ruleset => header.Ruleset;
private readonly BasicScrollContainer scrollFlow;
private readonly Container contentContainer;
private readonly DimmedLoadingLayer loading;
private readonly Box background;
+ private readonly RankingsOverlayHeader header;
private APIRequest lastRequest;
private CancellationTokenSource cancellationToken;
@@ -54,14 +57,11 @@ namespace osu.Game.Overlays
Direction = FillDirection.Vertical,
Children = new Drawable[]
{
- new RankingsOverlayHeader
+ header = new RankingsOverlayHeader
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
- Depth = -float.MaxValue,
- Country = { BindTarget = Country },
- Current = { BindTarget = Scope },
- Ruleset = { BindTarget = ruleset }
+ Depth = -float.MaxValue
},
new Container
{
@@ -94,6 +94,8 @@ namespace osu.Game.Overlays
protected override void LoadComplete()
{
+ base.LoadComplete();
+
Country.BindValueChanged(_ =>
{
// if a country is requested, force performance scope.
@@ -101,7 +103,7 @@ namespace osu.Game.Overlays
Scope.Value = RankingsScope.Performance;
Scheduler.AddOnce(loadNewContent);
- }, true);
+ });
Scope.BindValueChanged(_ =>
{
@@ -110,7 +112,7 @@ namespace osu.Game.Overlays
Country.Value = null;
Scheduler.AddOnce(loadNewContent);
- }, true);
+ });
ruleset.BindValueChanged(_ =>
{
@@ -118,9 +120,7 @@ namespace osu.Game.Overlays
return;
Scheduler.AddOnce(loadNewContent);
- }, true);
-
- base.LoadComplete();
+ });
}
public void ShowCountry(Country requested)
@@ -158,8 +158,8 @@ namespace osu.Game.Overlays
return;
}
- request.Success += () => loadContent(createTableFromResponse(request));
- request.Failure += _ => loadContent(null);
+ request.Success += () => Schedule(() => loadContent(createTableFromResponse(request)));
+ request.Failure += _ => Schedule(() => loadContent(null));
api.Queue(request);
}
@@ -221,5 +221,13 @@ namespace osu.Game.Overlays
contentContainer.Child = loaded;
}, (cancellationToken = new CancellationTokenSource()).Token);
}
+
+ protected override void Dispose(bool isDisposing)
+ {
+ lastRequest?.Cancel();
+ cancellationToken?.Cancel();
+
+ base.Dispose(isDisposing);
+ }
}
}
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
index 0612f028bc..3da64e0de4 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
@@ -14,14 +14,10 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
{
protected override string Header => "Devices";
- private AudioManager audio;
- private SettingsDropdown<string> dropdown;
+ [Resolved]
+ private AudioManager audio { get; set; }
- [BackgroundDependencyLoader]
- private void load(AudioManager audio)
- {
- this.audio = audio;
- }
+ private SettingsDropdown<string> dropdown;
protected override void Dispose(bool isDisposing)
{
diff --git a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
index e485aa5ea9..c55183772b 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
@@ -29,7 +29,9 @@ namespace osu.Game.Overlays.Settings.Sections.General
{
private bool bounding = true;
private LoginForm form;
- private OsuColour colours;
+
+ [Resolved]
+ private OsuColour colours { get; set; }
private UserPanel panel;
private UserDropdown dropdown;
@@ -60,10 +62,8 @@ namespace osu.Game.Overlays.Settings.Sections.General
}
[BackgroundDependencyLoader(permitNulls: true)]
- private void load(OsuColour colours, IAPIProvider api)
+ private void load(IAPIProvider api)
{
- this.colours = colours;
-
api?.Register(this);
}
@@ -201,7 +201,9 @@ namespace osu.Game.Overlays.Settings.Sections.General
private TextBox username;
private TextBox password;
private ShakeContainer shakeSignIn;
- private IAPIProvider api;
+
+ [Resolved(CanBeNull = true)]
+ private IAPIProvider api { get; set; }
public Action RequestHide;
@@ -214,9 +216,8 @@ namespace osu.Game.Overlays.Settings.Sections.General
}
[BackgroundDependencyLoader(permitNulls: true)]
- private void load(IAPIProvider api, OsuConfigManager config, AccountCreationOverlay accountCreation)
+ private void load(OsuConfigManager config, AccountCreationOverlay accountCreation)
{
- this.api = api;
Direction = FillDirection.Vertical;
Spacing = new Vector2(0, 5);
AutoSizeAxes = Axes.Y;
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index efbb08b7df..b73c8f7622 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -29,7 +29,9 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
private Bindable<Size> sizeFullscreen;
private readonly IBindableList<WindowMode> windowModes = new BindableList<WindowMode>();
- private OsuGameBase game;
+ [Resolved]
+ private OsuGameBase game { get; set; }
+
private SettingsDropdown<Size> resolutionDropdown;
private SettingsDropdown<WindowMode> windowModeDropdown;
@@ -41,10 +43,8 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
private const int transition_duration = 400;
[BackgroundDependencyLoader]
- private void load(FrameworkConfigManager config, OsuConfigManager osuConfig, OsuGameBase game, GameHost host)
+ private void load(FrameworkConfigManager config, OsuConfigManager osuConfig, GameHost host)
{
- this.game = game;
-
scalingMode = osuConfig.GetBindable<ScalingMode>(OsuSetting.Scaling);
sizeFullscreen = config.GetBindable<Size>(FrameworkSetting.SizeFullscreen);
scalingSizeX = osuConfig.GetBindable<float>(OsuSetting.ScalingSizeX);
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index d3029d8ab9..b229014c84 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -24,13 +24,12 @@ namespace osu.Game.Overlays.Settings.Sections
private readonly Bindable<SkinInfo> dropdownBindable = new Bindable<SkinInfo> { Default = SkinInfo.Default };
private readonly Bindable<int> configBindable = new Bindable<int>();
- private SkinManager skins;
+ [Resolved]
+ private SkinManager skins { get; set; }
[BackgroundDependencyLoader]
- private void load(OsuConfigManager config, SkinManager skins)
+ private void load(OsuConfigManager config)
{
- this.skins = skins;
-
FlowContent.Spacing = new Vector2(0, 5);
Children = new Drawable[]
{
diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 8289ca175d..960585b968 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -23,7 +23,8 @@ namespace osu.Game.Rulesets.Judgements
{
private const float judgement_size = 128;
- private OsuColour colours;
+ [Resolved]
+ private OsuColour colours { get; set; }
protected readonly JudgementResult Result;
@@ -56,10 +57,8 @@ namespace osu.Game.Rulesets.Judgements
}
[BackgroundDependencyLoader]
- private void load(OsuColour colours)
+ private void load()
{
- this.colours = colours;
-
InternalChild = JudgementBody = new Container
{
Anchor = Anchor.Centre,
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index e391157b5b..67fe18e8dd 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -116,17 +116,16 @@ namespace osu.Game.Rulesets.Objects.Drawables
HitObject.DefaultsApplied += onDefaultsApplied;
startTimeBindable = HitObject.StartTimeBindable.GetBoundCopy();
- startTimeBindable.BindValueChanged(_ => updateState(ArmedState.Idle, true));
+ startTimeBindable.BindValueChanged(_ => updateState(State.Value, true));
if (HitObject is IHasComboInformation combo)
{
comboIndexBindable = combo.ComboIndexBindable.GetBoundCopy();
- comboIndexBindable.BindValueChanged(_ => updateAccentColour(), true);
+ comboIndexBindable.BindValueChanged(_ => updateComboColour(), true);
}
samplesBindable = HitObject.SamplesBindable.GetBoundCopy();
- samplesBindable.ItemsAdded += _ => loadSamples();
- samplesBindable.ItemsRemoved += _ => loadSamples();
+ samplesBindable.CollectionChanged += (_, __) => loadSamples();
updateState(ArmedState.Idle, true);
onDefaultsApplied();
@@ -250,8 +249,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
double transformTime = HitObject.StartTime - InitialLifetimeOffset;
- base.ApplyTransformsAt(transformTime, true);
- base.ClearTransformsAfter(transformTime, true);
+ base.ApplyTransformsAt(double.MinValue, true);
+ base.ClearTransformsAfter(double.MinValue, true);
using (BeginAbsoluteSequence(transformTime, true))
{
@@ -337,7 +336,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
{
base.SkinChanged(skin, allowFallback);
- updateAccentColour();
+ updateComboColour();
ApplySkin(skin, allowFallback);
@@ -345,13 +344,29 @@ namespace osu.Game.Rulesets.Objects.Drawables
updateState(State.Value, true);
}
- private void updateAccentColour()
+ private void updateComboColour()
{
- if (HitObject is IHasComboInformation combo)
- {
- var comboColours = CurrentSkin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
- AccentColour.Value = comboColours?.Count > 0 ? comboColours[combo.ComboIndex % comboColours.Count] : Color4.White;
- }
+ if (!(HitObject is IHasComboInformation)) return;
+
+ var comboColours = CurrentSkin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
+
+ AccentColour.Value = GetComboColour(comboColours);
+ }
+
+ /// <summary>
+ /// Called to retrieve the combo colour. Automatically assigned to <see cref="AccentColour"/>.
+ /// Defaults to using <see cref="IHasComboInformation.ComboIndex"/> to decide on a colour.
+ /// </summary>
+ /// <remarks>
+ /// This will only be called if the <see cref="HitObject"/> implements <see cref="IHasComboInformation"/>.
+ /// </remarks>
+ /// <param name="comboColours">A list of combo colours provided by the beatmap or skin. Can be null if not available.</param>
+ protected virtual Color4 GetComboColour(IReadOnlyList<Color4> comboColours)
+ {
+ if (!(HitObject is IHasComboInformation combo))
+ throw new InvalidOperationException($"{nameof(HitObject)} must implement {nameof(IHasComboInformation)}");
+
+ return comboColours?.Count > 0 ? comboColours[combo.ComboIndex % comboColours.Count] : Color4.White;
}
/// <summary>
diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 62a5b6f0b5..d577e8fdda 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
+using System.Collections.Specialized;
using System.Linq;
using Newtonsoft.Json;
using osu.Framework.Bindables;
@@ -47,18 +48,20 @@ namespace osu.Game.Rulesets.Objects
{
ExpectedDistance.ValueChanged += _ => invalidate();
- ControlPoints.ItemsAdded += items =>
+ ControlPoints.CollectionChanged += (_, args) =>
{
- foreach (var c in items)
- c.Changed += invalidate;
+ switch (args.Action)
+ {
+ case NotifyCollectionChangedAction.Add:
+ foreach (var c in args.NewItems.Cast<PathControlPoint>())
+ c.Changed += invalidate;
+ break;
- invalidate();
- };
-
- ControlPoints.ItemsRemoved += items =>
- {
- foreach (var c in items)
- c.Changed -= invalidate;
+ case NotifyCollectionChangedAction.Remove:
+ foreach (var c in args.OldItems.Cast<PathControlPoint>())
+ c.Changed -= invalidate;
+ break;
+ }
invalidate();
};
diff --git a/osu.Game/Rulesets/Replays/AutoGenerator.cs b/osu.Game/Rulesets/Replays/AutoGenerator.cs
index 3319f30a6f..b3c609f2f4 100644
--- a/osu.Game/Rulesets/Replays/AutoGenerator.cs
+++ b/osu.Game/Rulesets/Replays/AutoGenerator.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Replays
#region Constants
// Shared amongst all modes
- protected const double KEY_UP_DELAY = 50;
+ public const double KEY_UP_DELAY = 50;
#endregion
diff --git a/osu.Game/Rulesets/RulesetInfo.cs b/osu.Game/Rulesets/RulesetInfo.cs
index ececc18c96..afd499cb9e 100644
--- a/osu.Game/Rulesets/RulesetInfo.cs
+++ b/osu.Game/Rulesets/RulesetInfo.cs
@@ -50,6 +50,6 @@ namespace osu.Game.Rulesets
}
}
- public override string ToString() => $"{Name} ({ShortName}) ID: {ID}";
+ public override string ToString() => Name ?? $"{Name} ({ShortName}) ID: {ID}";
}
}
diff --git a/osu.Game/Screens/Edit/Components/PlaybackControl.cs b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
index 66df68418a..897c6ec531 100644
--- a/osu.Game/Screens/Edit/Components/PlaybackControl.cs
+++ b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
@@ -25,15 +25,14 @@ namespace osu.Game.Screens.Edit.Components
{
private IconButton playButton;
- private IAdjustableClock adjustableClock;
+ [Resolved]
+ private IAdjustableClock adjustableClock { get; set; }
private readonly BindableNumber<double> tempo = new BindableDouble(1);
[BackgroundDependencyLoader]
- private void load(IAdjustableClock adjustableClock)
+ private void load()
{
- this.adjustableClock = adjustableClock;
-
Children = new Drawable[]
{
playButton = new IconButton
diff --git a/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs b/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs
index 0391074b11..4bf21d240a 100644
--- a/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs
+++ b/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs
@@ -14,7 +14,8 @@ namespace osu.Game.Screens.Edit.Components
{
private readonly OsuSpriteText trackTimer;
- private IAdjustableClock adjustableClock;
+ [Resolved]
+ private IAdjustableClock adjustableClock { get; set; }
public TimeInfoContainer()
{
@@ -30,12 +31,6 @@ namespace osu.Game.Screens.Edit.Components
};
}
- [BackgroundDependencyLoader]
- private void load(IAdjustableClock adjustableClock)
- {
- this.adjustableClock = adjustableClock;
- }
-
protected override void Update()
{
base.Update();
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 417d32ca4f..c81c6059cc 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
+using System.Collections.Specialized;
using System.Diagnostics;
using System.Linq;
using osu.Framework.Allocation;
@@ -70,18 +71,20 @@ namespace osu.Game.Screens.Edit.Compose.Components
AddBlueprintFor(obj);
selectedHitObjects.BindTo(beatmap.SelectedHitObjects);
- selectedHitObjects.ItemsAdded += objects =>
+ selectedHitObjects.CollectionChanged += (selectedObjects, args) =>
{
- foreach (var o in objects)
- SelectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Select();
+ switch (args.Action)
+ {
+ case NotifyCollectionChangedAction.Add:
+ foreach (var o in args.NewItems)
+ SelectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Select();
+ break;
- SelectionChanged?.Invoke(selectedHitObjects);
- };
-
- selectedHitObjects.ItemsRemoved += objects =>
- {
- foreach (var o in objects)
- SelectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Deselect();
+ case NotifyCollectionChangedAction.Remove:
+ foreach (var o in args.OldItems)
+ SelectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Deselect();
+ break;
+ }
SelectionChanged?.Invoke(selectedHitObjects);
};
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 8b47ea2c6c..0eb77a8561 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -7,7 +7,6 @@ using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Input;
-using osu.Framework.Input.Events;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Edit.Tools;
using osu.Game.Rulesets.Objects;
@@ -76,17 +75,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
#endregion
- protected override bool OnMouseMove(MouseMoveEvent e)
- {
- if (currentPlacement != null)
- {
- updatePlacementPosition(e.ScreenSpaceMousePosition);
- return true;
- }
-
- return base.OnMouseMove(e);
- }
-
protected override void Update()
{
base.Update();
@@ -95,6 +83,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
createPlacement();
else if (currentPlacement?.PlacementActive == false)
removePlacement();
+
+ if (currentPlacement != null)
+ updatePlacementPosition(inputManager.CurrentState.Mouse.Position);
}
protected sealed override SelectionBlueprint CreateBlueprintFor(HitObject hitObject)
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 0475e68e42..ddca5e42c2 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -24,7 +24,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
public readonly Bindable<bool> WaveformVisible = new Bindable<bool>();
public readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
- private IAdjustableClock adjustableClock;
+ [Resolved]
+ private IAdjustableClock adjustableClock { get; set; }
public Timeline()
{
@@ -36,10 +37,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
private WaveformGraph waveform;
[BackgroundDependencyLoader]
- private void load(IBindable<WorkingBeatmap> beatmap, IAdjustableClock adjustableClock, OsuColour colours)
+ private void load(IBindable<WorkingBeatmap> beatmap, OsuColour colours)
{
- this.adjustableClock = adjustableClock;
-
Add(waveform = new WaveformGraph
{
RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
index 7ce8a751e0..227eecf9c7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
@@ -2,10 +2,12 @@
// See the LICENCE file in the repository root for full licence text.
using System;
+using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Transforms;
using osu.Framework.Input.Events;
+using osu.Framework.Timing;
using osu.Framework.Utils;
using osu.Game.Graphics.Containers;
using osuTK;
@@ -30,6 +32,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
private float currentZoom = 1;
+ [Resolved(canBeNull: true)]
+ private IFrameBasedClock editorClock { get; set; }
+
public ZoomableScrollContainer()
: base(Direction.Horizontal)
{
@@ -104,8 +109,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
protected override bool OnScroll(ScrollEvent e)
{
if (e.IsPrecise)
+ {
+ // can't handle scroll correctly while playing.
+ // the editor will handle this case for us.
+ if (editorClock?.IsRunning == true)
+ return false;
+
// for now, we don't support zoom when using a precision scroll device. this needs gesture support.
return base.OnScroll(e);
+ }
setZoomTarget(zoomTarget + e.ScrollDelta.Y, zoomedContent.ToLocalSpace(e.ScreenSpaceMousePosition).X);
return true;
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index d94f8aa11a..fe538728e3 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -301,15 +301,15 @@ namespace osu.Game.Screens.Menu
case ButtonSystemState.Initial:
logoDelayedAction?.Cancel();
logoDelayedAction = Scheduler.AddDelayed(() =>
- {
- logoTrackingContainer.StopTracking();
+ {
+ logoTrackingContainer.StopTracking();
- game?.Toolbar.Hide();
+ game?.Toolbar.Hide();
- logo.ClearTransforms(targetMember: nameof(Position));
- logo.MoveTo(new Vector2(0.5f), 800, Easing.OutExpo);
- logo.ScaleTo(1, 800, Easing.OutExpo);
- }, buttonArea.Alpha * 150);
+ logo.ClearTransforms(targetMember: nameof(Position));
+ logo.MoveTo(new Vector2(0.5f), 800, Easing.OutExpo);
+ logo.ScaleTo(1, 800, Easing.OutExpo);
+ }, buttonArea.Alpha * 150);
break;
case ButtonSystemState.TopLevel:
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 50cfe23481..29f32406e8 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Menu
private SampleChannel welcome;
[BackgroundDependencyLoader]
- private void load(AudioManager audio)
+ private void load()
{
if (MenuVoice.Value && !MenuMusic.Value)
welcome = audio.Samples.Get(@"welcome");
@@ -102,13 +102,12 @@ namespace osu.Game.Screens.Menu
this.background = background;
}
- private OsuGameBase game;
+ [Resolved]
+ private OsuGameBase game { get; set; }
[BackgroundDependencyLoader]
- private void load(TextureStore textures, OsuGameBase game)
+ private void load(TextureStore textures)
{
- this.game = game;
-
InternalChildren = new Drawable[]
{
triangles = new GlitchingTriangles
diff --git a/osu.Game/Screens/Multi/Components/BeatmapDetailAreaPlaylistTabItem.cs b/osu.Game/Screens/Multi/Components/BeatmapDetailAreaPlaylistTabItem.cs
new file mode 100644
index 0000000000..3f2ab28f1a
--- /dev/null
+++ b/osu.Game/Screens/Multi/Components/BeatmapDetailAreaPlaylistTabItem.cs
@@ -0,0 +1,12 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Screens.Select;
+
+namespace osu.Game.Screens.Multi.Components
+{
+ public class BeatmapDetailAreaPlaylistTabItem : BeatmapDetailAreaTabItem
+ {
+ public override string Name => "Playlist";
+ }
+}
diff --git a/osu.Game/Screens/Multi/Components/BeatmapTitle.cs b/osu.Game/Screens/Multi/Components/BeatmapTitle.cs
index baf11dfe0d..9e7a59d7d2 100644
--- a/osu.Game/Screens/Multi/Components/BeatmapTitle.cs
+++ b/osu.Game/Screens/Multi/Components/BeatmapTitle.cs
@@ -26,8 +26,7 @@ namespace osu.Game.Screens.Multi.Components
[BackgroundDependencyLoader]
private void load()
{
- Playlist.ItemsAdded += _ => updateText();
- Playlist.ItemsRemoved += _ => updateText();
+ Playlist.CollectionChanged += (_, __) => updateText();
updateText();
}
diff --git a/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs b/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs
index a1334101b8..ce3b612262 100644
--- a/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs
+++ b/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs
@@ -51,8 +51,7 @@ namespace osu.Game.Screens.Multi.Components
}
};
- Playlist.ItemsAdded += _ => updateInfo();
- Playlist.ItemsRemoved += _ => updateInfo();
+ Playlist.CollectionChanged += (_, __) => updateInfo();
updateInfo();
}
diff --git a/osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs b/osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs
new file mode 100644
index 0000000000..2c5fd2d397
--- /dev/null
+++ b/osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs
@@ -0,0 +1,98 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Screens.Select;
+using osuTK;
+
+namespace osu.Game.Screens.Multi.Components
+{
+ public class MatchBeatmapDetailArea : BeatmapDetailArea
+ {
+ public Action CreateNewItem;
+
+ public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
+
+ [Resolved(typeof(Room))]
+ protected BindableList<PlaylistItem> Playlist { get; private set; }
+
+ private readonly Drawable playlistArea;
+ private readonly DrawableRoomPlaylist playlist;
+
+ public MatchBeatmapDetailArea()
+ {
+ Add(playlistArea = new Container
+ {
+ RelativeSizeAxes = Axes.Both,
+ Padding = new MarginPadding { Vertical = 10 },
+ Child = new GridContainer
+ {
+ RelativeSizeAxes = Axes.Both,
+ Content = new[]
+ {
+ new Drawable[]
+ {
+ new Container
+ {
+ RelativeSizeAxes = Axes.Both,
+ Padding = new MarginPadding { Bottom = 10 },
+ Child = playlist = new DrawableRoomPlaylist(true, false)
+ {
+ RelativeSizeAxes = Axes.Both,
+ }
+ }
+ },
+ new Drawable[]
+ {
+ new TriangleButton
+ {
+ Text = "Add new playlist entry",
+ RelativeSizeAxes = Axes.Both,
+ Size = Vector2.One,
+ Action = () => CreateNewItem?.Invoke()
+ }
+ },
+ },
+ RowDimensions = new[]
+ {
+ new Dimension(),
+ new Dimension(GridSizeMode.Absolute, 50),
+ }
+ }
+ });
+ }
+
+ protected override void LoadComplete()
+ {
+ base.LoadComplete();
+
+ playlist.Items.BindTo(Playlist);
+ playlist.SelectedItem.BindTo(SelectedItem);
+ }
+
+ protected override void OnTabChanged(BeatmapDetailAreaTabItem tab, bool selectedMods)
+ {
+ base.OnTabChanged(tab, selectedMods);
+
+ switch (tab)
+ {
+ case BeatmapDetailAreaPlaylistTabItem _:
+ playlistArea.Show();
+ break;
+
+ default:
+ playlistArea.Hide();
+ break;
+ }
+ }
+
+ protected override BeatmapDetailAreaTabItem[] CreateTabItems() => base.CreateTabItems().Prepend(new BeatmapDetailAreaPlaylistTabItem()).ToArray();
+ }
+}
diff --git a/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs b/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs
index 258541bbd6..0015feb26a 100644
--- a/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs
+++ b/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs
@@ -48,8 +48,7 @@ namespace osu.Game.Screens.Multi.Components
Type.BindValueChanged(type => gameTypeContainer.Child = new DrawableGameType(type.NewValue) { Size = new Vector2(height) }, true);
- Playlist.ItemsAdded += _ => updateBeatmap();
- Playlist.ItemsRemoved += _ => updateBeatmap();
+ Playlist.CollectionChanged += (_, __) => updateBeatmap();
updateBeatmap();
}
diff --git a/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs b/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs
index 5e2f2e530a..2240e55e2f 100644
--- a/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs
+++ b/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs
@@ -23,8 +23,7 @@ namespace osu.Game.Screens.Multi.Components
{
InternalChild = sprite = CreateBackgroundSprite();
- Playlist.ItemsAdded += _ => updateBeatmap();
- Playlist.ItemsRemoved += _ => updateBeatmap();
+ Playlist.CollectionChanged += (_, __) => updateBeatmap();
updateBeatmap();
}
diff --git a/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs b/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
new file mode 100644
index 0000000000..71cabd8b50
--- /dev/null
+++ b/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
@@ -0,0 +1,116 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osuTK;
+
+namespace osu.Game.Screens.Multi.Components
+{
+ public abstract class OverlinedDisplay : MultiplayerComposite
+ {
+ protected readonly Container Content;
+
+ public override Axes RelativeSizeAxes
+ {
+ get => base.RelativeSizeAxes;
+ set
+ {
+ base.RelativeSizeAxes = value;
+ updateDimensions();
+ }
+ }
+
+ public override Axes AutoSizeAxes
+ {
+ get => base.AutoSizeAxes;
+ protected set
+ {
+ base.AutoSizeAxes = value;
+ updateDimensions();
+ }
+ }
+
+ protected string Details
+ {
+ set => details.Text = value;
+ }
+
+ private readonly Circle line;
+ private readonly OsuSpriteText details;
+ private readonly GridContainer grid;
+
+ protected OverlinedDisplay(string title)
+ {
+ InternalChild = grid = new GridContainer
+ {
+ Content = new[]
+ {
+ new Drawable[]
+ {
+ line = new Circle
+ {
+ RelativeSizeAxes = Axes.X,
+ Height = 2,
+ Margin = new MarginPadding { Bottom = 2 }
+ },
+ },
+ new Drawable[]
+ {
+ new FillFlowContainer
+ {
+ AutoSizeAxes = Axes.Both,
+ Direction = FillDirection.Horizontal,
+ Margin = new MarginPadding { Top = 5 },
+ Spacing = new Vector2(10, 0),
+ Children = new Drawable[]
+ {
+ new OsuSpriteText
+ {
+ Text = title,
+ Font = OsuFont.GetFont(size: 14)
+ },
+ details = new OsuSpriteText { Font = OsuFont.GetFont(size: 14) },
+ }
+ },
+ },
+ new Drawable[]
+ {
+ Content = new Container { Margin = new MarginPadding { Top = 5 } }
+ }
+ }
+ };
+
+ updateDimensions();
+ }
+
+ [BackgroundDependencyLoader]
+ private void load(OsuColour colours)
+ {
+ line.Colour = colours.Yellow;
+ details.Colour = colours.Yellow;
+ }
+
+ private void updateDimensions()
+ {
+ grid.RowDimensions = new[]
+ {
+ new Dimension(GridSizeMode.AutoSize),
+ new Dimension(GridSizeMode.AutoSize),
+ new Dimension(AutoSizeAxes.HasFlag(Axes.Y) ? GridSizeMode.AutoSize : GridSizeMode.Distributed),
+ };
+
+ // Assigning to none is done so that setting auto and relative size modes doesn't cause exceptions to be thrown
+ grid.AutoSizeAxes = Content.AutoSizeAxes = Axes.None;
+ grid.RelativeSizeAxes = Content.RelativeSizeAxes = Axes.None;
+
+ // Auto-size when required, otherwise eagerly relative-size
+ grid.AutoSizeAxes = Content.AutoSizeAxes = AutoSizeAxes;
+ grid.RelativeSizeAxes = Content.RelativeSizeAxes = ~AutoSizeAxes;
+ }
+ }
+}
diff --git a/osu.Game/Screens/Multi/Components/OverlinedParticipants.cs b/osu.Game/Screens/Multi/Components/OverlinedParticipants.cs
new file mode 100644
index 0000000000..a709c6a57a
--- /dev/null
+++ b/osu.Game/Screens/Multi/Components/OverlinedParticipants.cs
@@ -0,0 +1,56 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.Containers;
+
+namespace osu.Game.Screens.Multi.Components
+{
+ public class OverlinedParticipants : OverlinedDisplay
+ {
+ public new Axes AutoSizeAxes
+ {
+ get => base.AutoSizeAxes;
+ set => base.AutoSizeAxes = value;
+ }
+
+ public OverlinedParticipants(Direction direction)
+ : base("Participants")
+ {
+ OsuScrollContainer scroll;
+ ParticipantsList list;
+
+ Content.Add(scroll = new OsuScrollContainer(direction)
+ {
+ Child = list = new ParticipantsList()
+ });
+
+ switch (direction)
+ {
+ case Direction.Horizontal:
+ scroll.RelativeSizeAxes = Axes.X;
+ scroll.Height = ParticipantsList.TILE_SIZE + OsuScrollContainer.SCROLL_BAR_HEIGHT + OsuScrollContainer.SCROLL_BAR_PADDING * 2;
+ list.AutoSizeAxes = Axes.Both;
+ break;
+
+ case Direction.Vertical:
+ scroll.RelativeSizeAxes = Axes.Both;
+ list.RelativeSizeAxes = Axes.X;
+ list.AutoSizeAxes = Axes.Y;
+ break;
+ }
+ }
+
+ [BackgroundDependencyLoader]
+ private void load()
+ {
+ ParticipantCount.BindValueChanged(_ => setParticipantCount());
+ MaxParticipants.BindValueChanged(_ => setParticipantCount());
+
+ setParticipantCount();
+ }
+
+ private void setParticipantCount() => Details = MaxParticipants.Value != null ? $"{ParticipantCount.Value}/{MaxParticipants.Value}" : ParticipantCount.Value.ToString();
+ }
+}
diff --git a/osu.Game/Screens/Multi/Components/OverlinedPlaylist.cs b/osu.Game/Screens/Multi/Components/OverlinedPlaylist.cs
new file mode 100644
index 0000000000..4fe79b40a0
--- /dev/null
+++ b/osu.Game/Screens/Multi/Components/OverlinedPlaylist.cs
@@ -0,0 +1,33 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Online.Multiplayer;
+
+namespace osu.Game.Screens.Multi.Components
+{
+ public class OverlinedPlaylist : OverlinedDisplay
+ {
+ public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
+
+ private readonly DrawableRoomPlaylist playlist;
+
+ public OverlinedPlaylist(bool allowSelection)
+ : base("Playlist")
+ {
+ Content.Add(playlist = new DrawableRoomPlaylist(false, allowSelection)
+ {
+ RelativeSizeAxes = Axes.Both,
+ SelectedItem = { BindTarget = SelectedItem }
+ });
+ }
+
+ [BackgroundDependencyLoader]
+ private void load()
+ {
+ playlist.Items.BindTo(Playlist);
+ }
+ }
+}
diff --git a/osu.Game/Screens/Multi/Components/ParticipantsList.cs b/osu.Game/Screens/Multi/Components/ParticipantsList.cs
new file mode 100644
index 0000000000..e383e0414b
--- /dev/null
+++ b/osu.Game/Screens/Multi/Components/ParticipantsList.cs
@@ -0,0 +1,136 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Users;
+using osu.Game.Users.Drawables;
+using osuTK;
+
+namespace osu.Game.Screens.Multi.Components
+{
+ public class ParticipantsList : MultiplayerComposite
+ {
+ public const float TILE_SIZE = 35;
+
+ public override Axes RelativeSizeAxes
+ {
+ get => base.RelativeSizeAxes;
+ set
+ {
+ base.RelativeSizeAxes = value;
+ fill.RelativeSizeAxes = value;
+ }
+ }
+
+ public new Axes AutoSizeAxes
+ {
+ get => base.AutoSizeAxes;
+ set
+ {
+ base.AutoSizeAxes = value;
+ fill.AutoSizeAxes = value;
+ }
+ }
+
+ public FillDirection Direction
+ {
+ get => fill.Direction;
+ set => fill.Direction = value;
+ }
+
+ private readonly FillFlowContainer fill;
+
+ public ParticipantsList()
+ {
+ InternalChild = fill = new FillFlowContainer { Spacing = new Vector2(10) };
+ }
+
+ [BackgroundDependencyLoader]
+ private void load()
+ {
+ RoomID.BindValueChanged(_ => updateParticipants(), true);
+ }
+
+ [Resolved]
+ private IAPIProvider api { get; set; }
+
+ private GetRoomScoresRequest request;
+
+ private void updateParticipants()
+ {
+ var roomId = RoomID.Value ?? 0;
+
+ request?.Cancel();
+
+ // nice little progressive fade
+ int time = 500;
+
+ foreach (var c in fill.Children)
+ {
+ c.Delay(500 - time).FadeOut(time, Easing.Out);
+ time = Math.Max(20, time - 20);
+ c.Expire();
+ }
+
+ if (roomId == 0) return;
+
+ request = new GetRoomScoresRequest(roomId);
+ request.Success += scores => Schedule(() =>
+ {
+ if (roomId != RoomID.Value)
+ return;
+
+ fill.Clear();
+ foreach (var s in scores)
+ fill.Add(new UserTile(s.User));
+
+ fill.FadeInFromZero(1000, Easing.OutQuint);
+ });
+
+ api.Queue(request);
+ }
+
+ protected override void Dispose(bool isDisposing)
+ {
+ request?.Cancel();
+ base.Dispose(isDisposing);
+ }
+
+ private class UserTile : CompositeDrawable, IHasTooltip
+ {
+ private readonly User user;
+
+ public string TooltipText => user.Username;
+
+ public UserTile(User user)
+ {
+ this.user = user;
+ Size = new Vector2(TILE_SIZE);
+ CornerRadius = 5f;
+ Masking = true;
+
+ InternalChildren = new Drawable[]
+ {
+ new Box
+ {
+ RelativeSizeAxes = Axes.Both,
+ Colour = OsuColour.FromHex(@"27252d"),
+ },
+ new UpdateableAvatar
+ {
+ RelativeSizeAxes = Axes.Both,
+ User = user,
+ },
+ };
+ }
+ }
+ }
+}
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
new file mode 100644
index 0000000000..9a3fcb1cdc
--- /dev/null
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
@@ -0,0 +1,78 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Specialized;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Containers;
+using osu.Game.Online.Multiplayer;
+using osuTK;
+
+namespace osu.Game.Screens.Multi
+{
+ public class DrawableRoomPlaylist : OsuRearrangeableListContainer<PlaylistItem>
+ {
+ public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
+
+ private readonly bool allowEdit;
+ private readonly bool allowSelection;
+
+ public DrawableRoomPlaylist(bool allowEdit, bool allowSelection)
+ {
+ this.allowEdit = allowEdit;
+ this.allowSelection = allowSelection;
+ }
+
+ protected override void LoadComplete()
+ {
+ base.LoadComplete();
+
+ // Scheduled since items are removed and re-added upon rearrangement
+ Items.CollectionChanged += (_, args) => Schedule(() =>
+ {
+ switch (args.Action)
+ {
+ case NotifyCollectionChangedAction.Remove:
+ if (args.OldItems.Contains(SelectedItem))
+ SelectedItem.Value = null;
+ break;
+ }
+ });
+ }
+
+ protected override ScrollContainer<Drawable> CreateScrollContainer() => base.CreateScrollContainer().With(d =>
+ {
+ d.ScrollbarVisible = false;
+ });
+
+ protected override FillFlowContainer<RearrangeableListItem<PlaylistItem>> CreateListFillFlowContainer() => new FillFlowContainer<RearrangeableListItem<PlaylistItem>>
+ {
+ LayoutDuration = 200,
+ LayoutEasing = Easing.OutQuint,
+ Spacing = new Vector2(0, 2)
+ };
+
+ protected override OsuRearrangeableListItem<PlaylistItem> CreateOsuDrawable(PlaylistItem item) => new DrawableRoomPlaylistItem(item, allowEdit, allowSelection)
+ {
+ SelectedItem = { BindTarget = SelectedItem },
+ RequestDeletion = requestDeletion
+ };
+
+ private void requestSelection(PlaylistItem item) => SelectedItem.Value = item;
+
+ private void requestDeletion(PlaylistItem item)
+ {
+ if (SelectedItem.Value == item)
+ {
+ if (Items.Count == 1)
+ SelectedItem.Value = null;
+ else
+ SelectedItem.Value = Items.GetNext(item) ?? Items[^2];
+ }
+
+ Items.Remove(item);
+ }
+ }
+}
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
new file mode 100644
index 0000000000..a7ed1f5846
--- /dev/null
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -0,0 +1,297 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Events;
+using osu.Framework.Threading;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawables;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online;
+using osu.Game.Online.Chat;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Overlays.Direct;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Multi
+{
+ public class DrawableRoomPlaylistItem : OsuRearrangeableListItem<PlaylistItem>
+ {
+ public Action<PlaylistItem> RequestDeletion;
+
+ public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
+
+ protected override bool ShowDragHandle => allowEdit;
+
+ private Container maskingContainer;
+ private Container difficultyIconContainer;
+ private LinkFlowContainer beatmapText;
+ private LinkFlowContainer authorText;
+ private ModDisplay modDisplay;
+
+ private readonly Bindable<BeatmapInfo> beatmap = new Bindable<BeatmapInfo>();
+ private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
+ private readonly BindableList<Mod> requiredMods = new BindableList<Mod>();
+
+ private readonly PlaylistItem item;
+ private readonly bool allowEdit;
+ private readonly bool allowSelection;
+
+ protected override bool ShouldBeConsideredForInput(Drawable child) => allowEdit || !allowSelection || SelectedItem.Value == Model;
+
+ public DrawableRoomPlaylistItem(PlaylistItem item, bool allowEdit, bool allowSelection)
+ : base(item)
+ {
+ this.item = item;
+ this.allowEdit = allowEdit;
+ this.allowSelection = allowSelection;
+
+ beatmap.BindTo(item.Beatmap);
+ ruleset.BindTo(item.Ruleset);
+ requiredMods.BindTo(item.RequiredMods);
+ }
+
+ [BackgroundDependencyLoader]
+ private void load(OsuColour colours)
+ {
+ if (!allowEdit)
+ HandleColour = HandleColour.Opacity(0);
+
+ maskingContainer.BorderColour = colours.Yellow;
+ }
+
+ protected override void LoadComplete()
+ {
+ base.LoadComplete();
+
+ SelectedItem.BindValueChanged(selected => maskingContainer.BorderThickness = selected.NewValue == Model ? 5 : 0, true);
+
+ beatmap.BindValueChanged(_ => scheduleRefresh());
+ ruleset.BindValueChanged(_ => scheduleRefresh());
+
+ requiredMods.CollectionChanged += (_, __) => scheduleRefresh();
+
+ refresh();
+ }
+
+ private ScheduledDelegate scheduledRefresh;
+
+ private void scheduleRefresh()
+ {
+ scheduledRefresh?.Cancel();
+ scheduledRefresh = Schedule(refresh);
+ }
+
+ private void refresh()
+ {
+ difficultyIconContainer.Child = new DifficultyIcon(beatmap.Value, ruleset.Value) { Size = new Vector2(32) };
+
+ beatmapText.Clear();
+ beatmapText.AddLink(item.Beatmap.ToString(), LinkAction.OpenBeatmap, item.Beatmap.Value.OnlineBeatmapID.ToString());
+
+ authorText.Clear();
+
+ if (item.Beatmap?.Value?.Metadata?.Author != null)
+ {
+ authorText.AddText("mapped by ");
+ authorText.AddUserLink(item.Beatmap.Value?.Metadata.Author);
+ }
+
+ modDisplay.Current.Value = requiredMods.ToArray();
+ }
+
+ protected override Drawable CreateContent() => maskingContainer = new Container
+ {
+ RelativeSizeAxes = Axes.X,
+ Height = 50,
+ Masking = true,
+ CornerRadius = 10,
+ Children = new Drawable[]
+ {
+ new Box // A transparent box that forces the border to be drawn if the panel background is opaque
+ {
+ RelativeSizeAxes = Axes.Both,
+ Alpha = 0,
+ AlwaysPresent = true
+ },
+ new PanelBackground
+ {
+ RelativeSizeAxes = Axes.Both,
+ Beatmap = { BindTarget = beatmap }
+ },
+ new FillFlowContainer
+ {
+ RelativeSizeAxes = Axes.Both,
+ Padding = new MarginPadding { Left = 8 },
+ Spacing = new Vector2(8, 0),
+ Direction = FillDirection.Horizontal,
+ Children = new Drawable[]
+ {
+ difficultyIconContainer = new Container
+ {
+ Anchor = Anchor.CentreLeft,
+ Origin = Anchor.CentreLeft,
+ AutoSizeAxes = Axes.Both,
+ },
+ new FillFlowContainer
+ {
+ Anchor = Anchor.CentreLeft,
+ Origin = Anchor.CentreLeft,
+ AutoSizeAxes = Axes.Both,
+ Direction = FillDirection.Vertical,
+ Children = new Drawable[]
+ {
+ beatmapText = new LinkFlowContainer { AutoSizeAxes = Axes.Both },
+ new FillFlowContainer
+ {
+ AutoSizeAxes = Axes.Both,
+ Direction = FillDirection.Horizontal,
+ Spacing = new Vector2(10, 0),
+ Children = new Drawable[]
+ {
+ authorText = new LinkFlowContainer { AutoSizeAxes = Axes.Both },
+ modDisplay = new ModDisplay
+ {
+ Anchor = Anchor.CentreLeft,
+ Origin = Anchor.CentreLeft,
+ AutoSizeAxes = Axes.Both,
+ Scale = new Vector2(0.4f),
+ DisplayUnrankedText = false,
+ ExpansionMode = ExpansionMode.AlwaysExpanded
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ new Container
+ {
+ Anchor = Anchor.CentreRight,
+ Origin = Anchor.CentreRight,
+ AutoSizeAxes = Axes.Both,
+ X = -18,
+ Children = new Drawable[]
+ {
+ new PlaylistDownloadButton(item.Beatmap.Value.BeatmapSet)
+ {
+ Size = new Vector2(50, 30)
+ },
+ new IconButton
+ {
+ Icon = FontAwesome.Solid.MinusSquare,
+ Alpha = allowEdit ? 1 : 0,
+ Action = () => RequestDeletion?.Invoke(Model),
+ },
+ }
+ }
+ }
+ };
+
+ protected override bool OnClick(ClickEvent e)
+ {
+ if (allowSelection)
+ SelectedItem.Value = Model;
+ return true;
+ }
+
+ private class PlaylistDownloadButton : PanelDownloadButton
+ {
+ public PlaylistDownloadButton(BeatmapSetInfo beatmapSet, bool noVideo = false)
+ : base(beatmapSet, noVideo)
+ {
+ Alpha = 0;
+ }
+
+ protected override void LoadComplete()
+ {
+ base.LoadComplete();
+
+ State.BindValueChanged(stateChanged, true);
+ }
+
+ private void stateChanged(ValueChangedEvent<DownloadState> state)
+ {
+ this.FadeTo(state.NewValue == DownloadState.LocallyAvailable ? 0 : 1, 500);
+ }
+ }
+
+ // For now, this is the same implementation as in PanelBackground, but supports a beatmap info rather than a working beatmap
+ private class PanelBackground : Container // todo: should be a buffered container (https://github.com/ppy/osu-framework/issues/3222)
+ {
+ public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
+
+ public PanelBackground()
+ {
+ InternalChildren = new Drawable[]
+ {
+ new UpdateableBeatmapBackgroundSprite
+ {
+ RelativeSizeAxes = Axes.Both,
+ FillMode = FillMode.Fill,
+ Beatmap = { BindTarget = Beatmap }
+ },
+ new Container
+ {
+ Depth = -1,
+ RelativeSizeAxes = Axes.Both,
+ // This makes the gradient not be perfectly horizontal, but diagonal at a ~40° angle
+ Shear = new Vector2(0.8f, 0),
+ Alpha = 0.5f,
+ Children = new[]
+ {
+ // The left half with no gradient applied
+ new Box
+ {
+ RelativeSizeAxes = Axes.Both,
+ RelativePositionAxes = Axes.Both,
+ Colour = Color4.Black,
+ Width = 0.4f,
+ },
+ // Piecewise-linear gradient with 3 segments to make it appear smoother
+ new Box
+ {
+ RelativeSizeAxes = Axes.Both,
+ RelativePositionAxes = Axes.Both,
+ Colour = ColourInfo.GradientHorizontal(Color4.Black, new Color4(0f, 0f, 0f, 0.9f)),
+ Width = 0.05f,
+ X = 0.4f,
+ },
+ new Box
+ {
+ RelativeSizeAxes = Axes.Both,
+ RelativePositionAxes = Axes.Both,
+ Colour = ColourInfo.GradientHorizontal(new Color4(0f, 0f, 0f, 0.9f), new Color4(0f, 0f, 0f, 0.1f)),
+ Width = 0.2f,
+ X = 0.45f,
+ },
+ new Box
+ {
+ RelativeSizeAxes = Axes.Both,
+ RelativePositionAxes = Axes.Both,
+ Colour = ColourInfo.GradientHorizontal(new Color4(0f, 0f, 0f, 0.1f), new Color4(0, 0, 0, 0)),
+ Width = 0.05f,
+ X = 0.65f,
+ },
+ }
+ }
+ };
+ }
+ }
+ }
+}
diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
index 9f93afec9d..300418441e 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
@@ -4,8 +4,8 @@
using System.ComponentModel;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Threading;
-using osu.Game.Graphics;
using osu.Game.Overlays.SearchableList;
using osu.Game.Rulesets;
using osuTK.Graphics;
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
{
public class FilterControl : SearchableListFilterControl<PrimaryFilter, SecondaryFilter>
{
- protected override Color4 BackgroundColour => OsuColour.FromHex(@"362e42");
+ protected override Color4 BackgroundColour => Color4.Black.Opacity(0.5f);
protected override PrimaryFilter DefaultTab => PrimaryFilter.Open;
protected override SecondaryFilter DefaultCategory => SecondaryFilter.Public;
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomInfo.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomInfo.cs
new file mode 100644
index 0000000000..02f2667802
--- /dev/null
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomInfo.cs
@@ -0,0 +1,89 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Screens.Multi.Components;
+using osuTK;
+
+namespace osu.Game.Screens.Multi.Lounge.Components
+{
+ public class RoomInfo : MultiplayerComposite
+ {
+ private readonly List<Drawable> statusElements = new List<Drawable>();
+ private readonly SpriteText roomName;
+
+ public RoomInfo()
+ {
+ AutoSizeAxes = Axes.Y;
+
+ RoomStatusInfo statusInfo;
+ ModeTypeInfo typeInfo;
+ ParticipantInfo participantInfo;
+
+ InternalChild = new FillFlowContainer
+ {
+ RelativeSizeAxes = Axes.X,
+ AutoSizeAxes = Axes.Y,
+ Direction = FillDirection.Vertical,
+ Spacing = new Vector2(0, 4),
+ Children = new Drawable[]
+ {
+ new Container
+ {
+ RelativeSizeAxes = Axes.X,
+ AutoSizeAxes = Axes.Y,
+ Children = new Drawable[]
+ {
+ new FillFlowContainer
+ {
+ Anchor = Anchor.CentreLeft,
+ Origin = Anchor.CentreLeft,
+ AutoSizeAxes = Axes.Both,
+ Direction = FillDirection.Vertical,
+ Children = new Drawable[]
+ {
+ roomName = new OsuSpriteText { Font = OsuFont.GetFont(size: 30) },
+ statusInfo = new RoomStatusInfo(),
+ }
+ },
+ typeInfo = new ModeTypeInfo
+ {
+ Anchor = Anchor.CentreRight,
+ Origin = Anchor.CentreRight
+ }
+ }
+ },
+ participantInfo = new ParticipantInfo(),
+ }
+ };
+
+ statusElements.AddRange(new Drawable[] { statusInfo, typeInfo, participantInfo });
+ }
+
+ protected override void LoadComplete()
+ {
+ base.LoadComplete();
+
+ if (RoomID.Value == null)
+ statusElements.ForEach(e => e.FadeOut());
+
+ RoomID.BindValueChanged(id =>
+ {
+ if (id.NewValue == null)
+ statusElements.ForEach(e => e.FadeOut(100));
+ else
+ statusElements.ForEach(e => e.FadeIn(100));
+ }, true);
+
+ RoomName.BindValueChanged(name =>
+ {
+ roomName.Text = name.NewValue ?? "No room selected";
+ }, true);
+ }
+ }
+}
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
index 5030d8cb50..891853dee5 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
@@ -1,26 +1,13 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-using System;
using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Shapes;
using osu.Game.Beatmaps;
using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
-using osu.Game.Online.Multiplayer;
using osu.Game.Screens.Multi.Components;
-using osu.Game.Users;
-using osu.Game.Users.Drawables;
-using osuTK;
using osuTK.Graphics;
namespace osu.Game.Screens.Multi.Lounge.Components
@@ -31,16 +18,9 @@ namespace osu.Game.Screens.Multi.Lounge.Components
private readonly MarginPadding contentPadding = new MarginPadding { Horizontal = 20, Vertical = 10 };
- private ParticipantCountDisplay participantCount;
- private OsuSpriteText name;
- private BeatmapTypeInfo beatmapTypeInfo;
- private ParticipantInfo participantInfo;
-
[Resolved]
private BeatmapManager beatmaps { get; set; }
- private readonly Bindable<RoomStatus> status = new Bindable<RoomStatus>(new RoomStatusNoneSelected());
-
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
@@ -49,277 +29,52 @@ namespace osu.Game.Screens.Multi.Lounge.Components
new Box
{
RelativeSizeAxes = Axes.Both,
- Colour = OsuColour.FromHex(@"343138"),
+ Colour = Color4.Black,
+ Alpha = 0.25f
},
- new GridContainer
+ new Container
{
RelativeSizeAxes = Axes.Both,
- RowDimensions = new[]
+ Padding = new MarginPadding { Horizontal = 30 },
+ Child = new GridContainer
{
- new Dimension(GridSizeMode.AutoSize),
- new Dimension(GridSizeMode.Distributed),
- },
- Content = new[]
- {
- new Drawable[]
+ RelativeSizeAxes = Axes.Both,
+ Content = new[]
{
- new FillFlowContainer
+ new Drawable[]
{
- RelativeSizeAxes = Axes.X,
- AutoSizeAxes = Axes.Y,
- Direction = FillDirection.Vertical,
- Children = new Drawable[]
+ new FillFlowContainer
{
- new Container
+ RelativeSizeAxes = Axes.X,
+ AutoSizeAxes = Axes.Y,
+ Direction = FillDirection.Vertical,
+ Children = new Drawable[]
{
- RelativeSizeAxes = Axes.X,
- Height = 200,
- Masking = true,
- Children = new Drawable[]
+ new RoomInfo
{
- new MultiplayerBackgroundSprite { RelativeSizeAxes = Axes.Both },
- new Box
- {
- RelativeSizeAxes = Axes.Both,
- Colour = ColourInfo.GradientVertical(Color4.Black.Opacity(0.5f), Color4.Black.Opacity(0)),
- },
- new Container
- {
- RelativeSizeAxes = Axes.Both,
- Padding = new MarginPadding(20),
- Children = new Drawable[]
- {
- participantCount = new ParticipantCountDisplay
- {
- Anchor = Anchor.TopRight,
- Origin = Anchor.TopRight,
- },
- name = new OsuSpriteText
- {
- Anchor = Anchor.BottomLeft,
- Origin = Anchor.BottomLeft,
- Font = OsuFont.GetFont(size: 30),
- Current = RoomName
- },
- },
- },
+ RelativeSizeAxes = Axes.X,
+ Margin = new MarginPadding { Vertical = 60 },
},
- },
- new StatusColouredContainer(transition_duration)
- {
- RelativeSizeAxes = Axes.X,
- Height = 5,
- Child = new Box { RelativeSizeAxes = Axes.Both }
- },
- new Container
- {
- RelativeSizeAxes = Axes.X,
- AutoSizeAxes = Axes.Y,
- Children = new Drawable[]
+ new OverlinedParticipants(Direction.Horizontal)
{
- new Box
- {
- RelativeSizeAxes = Axes.Both,
- Colour = OsuColour.FromHex(@"28242d"),
- },
- new FillFlowContainer
- {
- RelativeSizeAxes = Axes.X,
- AutoSizeAxes = Axes.Y,
- Direction = FillDirection.Vertical,
- LayoutDuration = transition_duration,
- Padding = contentPadding,
- Spacing = new Vector2(0f, 5f),
- Children = new Drawable[]
- {
- new StatusColouredContainer(transition_duration)
- {
- AutoSizeAxes = Axes.Both,
- Child = new StatusText
- {
- Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 14),
- }
- },
- beatmapTypeInfo = new BeatmapTypeInfo(),
- },
- },
+ RelativeSizeAxes = Axes.X,
+ AutoSizeAxes = Axes.Y
},
- },
- new Container
- {
- RelativeSizeAxes = Axes.X,
- AutoSizeAxes = Axes.Y,
- Padding = contentPadding,
- Children = new Drawable[]
- {
- participantInfo = new ParticipantInfo(),
- },
- },
- },
+ }
+ }
+ },
+ new Drawable[]
+ {
+ new OverlinedPlaylist(false) { RelativeSizeAxes = Axes.Both },
},
},
- new Drawable[]
+ RowDimensions = new[]
{
- new MatchParticipants
- {
- RelativeSizeAxes = Axes.Both,
- }
+ new Dimension(GridSizeMode.AutoSize),
}
}
}
};
-
- Status.BindValueChanged(_ => updateStatus(), true);
- RoomID.BindValueChanged(_ => updateStatus(), true);
- }
-
- protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
- {
- var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
- dependencies.CacheAs(status, new CacheInfo(nameof(Room.Status), typeof(Room)));
- return dependencies;
- }
-
- private void updateStatus()
- {
- if (RoomID.Value == null)
- {
- status.Value = new RoomStatusNoneSelected();
-
- participantCount.FadeOut(transition_duration);
- beatmapTypeInfo.FadeOut(transition_duration);
- name.FadeOut(transition_duration);
- participantInfo.FadeOut(transition_duration);
- }
- else
- {
- status.Value = Status.Value;
-
- participantCount.FadeIn(transition_duration);
- beatmapTypeInfo.FadeIn(transition_duration);
- name.FadeIn(transition_duration);
- participantInfo.FadeIn(transition_duration);
- }
- }
-
- private class RoomStatusNoneSelected : RoomStatus
- {
- public override string Message => @"No Room Selected";
- public override Color4 GetAppropriateColour(OsuColour colours) => colours.Gray8;
- }
-
- private class StatusText : OsuSpriteText
- {
- [Resolved(typeof(Room), nameof(Room.Status))]
- private Bindable<RoomStatus> status { get; set; }
-
- [BackgroundDependencyLoader]
- private void load()
- {
- status.BindValueChanged(s => Text = s.NewValue.Message, true);
- }
- }
-
- private class MatchParticipants : MultiplayerComposite
- {
- private readonly FillFlowContainer fill;
-
- public MatchParticipants()
- {
- Padding = new MarginPadding { Horizontal = 10 };
-
- InternalChild = new OsuScrollContainer
- {
- RelativeSizeAxes = Axes.Both,
- Child = fill = new FillFlowContainer
- {
- Spacing = new Vector2(10),
- RelativeSizeAxes = Axes.X,
- AutoSizeAxes = Axes.Y,
- Direction = FillDirection.Full,
- }
- };
- }
-
- [BackgroundDependencyLoader]
- private void load()
- {
- RoomID.BindValueChanged(_ => updateParticipants(), true);
- }
-
- [Resolved]
- private IAPIProvider api { get; set; }
-
- private GetRoomScoresRequest request;
-
- private void updateParticipants()
- {
- var roomId = RoomID.Value ?? 0;
-
- request?.Cancel();
-
- // nice little progressive fade
- int time = 500;
-
- foreach (var c in fill.Children)
- {
- c.Delay(500 - time).FadeOut(time, Easing.Out);
- time = Math.Max(20, time - 20);
- c.Expire();
- }
-
- if (roomId == 0) return;
-
- request = new GetRoomScoresRequest(roomId);
- request.Success += scores =>
- {
- if (roomId != RoomID.Value)
- return;
-
- fill.Clear();
- foreach (var s in scores)
- fill.Add(new UserTile(s.User));
-
- fill.FadeInFromZero(1000, Easing.OutQuint);
- };
-
- api.Queue(request);
- }
-
- protected override void Dispose(bool isDisposing)
- {
- request?.Cancel();
- base.Dispose(isDisposing);
- }
-
- private class UserTile : CompositeDrawable, IHasTooltip
- {
- private readonly User user;
-
- public string TooltipText => user.Username;
-
- public UserTile(User user)
- {
- this.user = user;
- Size = new Vector2(70f);
- CornerRadius = 5f;
- Masking = true;
-
- InternalChildren = new Drawable[]
- {
- new Box
- {
- RelativeSizeAxes = Axes.Both,
- Colour = OsuColour.FromHex(@"27252d"),
- },
- new UpdateableAvatar
- {
- RelativeSizeAxes = Axes.Both,
- User = user,
- },
- };
- }
- }
}
}
}
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index 3709b85fcb..58e4548ee2 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Screens.Multi.Lounge
public LoungeSubScreen()
{
+ SearchContainer searchContainer;
+
InternalChildren = new Drawable[]
{
Filter = new FilterControl { Depth = -1 },
@@ -49,14 +51,14 @@ namespace osu.Game.Screens.Multi.Lounge
RelativeSizeAxes = Axes.Both,
ScrollbarOverlapsContent = false,
Padding = new MarginPadding(10),
- Child = new SearchContainer
+ Child = searchContainer = new SearchContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Child = new RoomsContainer { JoinRequested = joinRequested }
},
},
- processingOverlay = new ProcessingOverlay { Alpha = 0 }
+ processingOverlay = new ProcessingOverlay(searchContainer),
}
},
new RoomInspector
diff --git a/osu.Game/Screens/Multi/Match/Components/Footer.cs b/osu.Game/Screens/Multi/Match/Components/Footer.cs
new file mode 100644
index 0000000000..c0c866d815
--- /dev/null
+++ b/osu.Game/Screens/Multi/Match/Components/Footer.cs
@@ -0,0 +1,50 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Online.Multiplayer;
+using osuTK;
+
+namespace osu.Game.Screens.Multi.Match.Components
+{
+ public class Footer : CompositeDrawable
+ {
+ public const float HEIGHT = 100;
+
+ public Action OnStart;
+ public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
+
+ private readonly Drawable background;
+
+ public Footer()
+ {
+ RelativeSizeAxes = Axes.X;
+ Height = HEIGHT;
+
+ InternalChildren = new[]
+ {
+ background = new Box { RelativeSizeAxes = Axes.Both },
+ new ReadyButton
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ Size = new Vector2(600, 50),
+ SelectedItem = { BindTarget = SelectedItem },
+ Action = () => OnStart?.Invoke()
+ }
+ };
+ }
+
+ [BackgroundDependencyLoader]
+ private void load(OsuColour colours)
+ {
+ background.Colour = OsuColour.FromHex(@"28242d");
+ }
+ }
+}
diff --git a/osu.Game/Screens/Multi/Match/Components/Header.cs b/osu.Game/Screens/Multi/Match/Components/Header.cs
index cf1eb6b6ed..ddbaab1706 100644
--- a/osu.Game/Screens/Multi/Match/Components/Header.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Header.cs
@@ -1,39 +1,23 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-using System;
-using System.Linq;
using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Beatmaps.Drawables;
using osu.Game.Graphics;
-using osu.Game.Online.Multiplayer;
-using osu.Game.Overlays.SearchableList;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Screens.Multi.Components;
-using osu.Game.Screens.Play.HUD;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Users.Drawables;
using osuTK;
-using osuTK.Graphics;
namespace osu.Game.Screens.Multi.Match.Components
{
public class Header : MultiplayerComposite
{
- public const float HEIGHT = 200;
+ public const float HEIGHT = 50;
- public readonly BindableBool ShowBeatmapPanel = new BindableBool();
-
- public MatchTabControl Tabs { get; private set; }
-
- public Action RequestBeatmapSelection;
-
- private MatchBeatmapPanel beatmapPanel;
- private ModDisplay modDisplay;
+ private UpdateableAvatar avatar;
+ private LinkFlowContainer hostText;
public Header()
{
@@ -44,128 +28,52 @@ namespace osu.Game.Screens.Multi.Match.Components
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
- BeatmapSelectButton beatmapButton;
-
- InternalChildren = new Drawable[]
+ InternalChild = new FillFlowContainer
{
- new Container
+ AutoSizeAxes = Axes.Both,
+ Direction = FillDirection.Horizontal,
+ Spacing = new Vector2(10, 0),
+ Children = new Drawable[]
{
- RelativeSizeAxes = Axes.Both,
- Masking = true,
- Children = new Drawable[]
+ avatar = new UpdateableAvatar
{
- new HeaderBackgroundSprite { RelativeSizeAxes = Axes.Both },
- new Box
+ Size = new Vector2(50),
+ Masking = true,
+ CornerRadius = 10,
+ },
+ new FillFlowContainer
+ {
+ AutoSizeAxes = Axes.Both,
+ Direction = FillDirection.Vertical,
+ Children = new Drawable[]
{
- RelativeSizeAxes = Axes.Both,
- Colour = ColourInfo.GradientVertical(Color4.Black.Opacity(0.7f), Color4.Black.Opacity(0.8f)),
- },
- beatmapPanel = new MatchBeatmapPanel
- {
- Anchor = Anchor.CentreRight,
- Origin = Anchor.CentreRight,
- Margin = new MarginPadding { Right = 100 },
+ new OsuSpriteText
+ {
+ Font = OsuFont.GetFont(size: 30),
+ Current = { BindTarget = RoomName }
+ },
+ hostText = new LinkFlowContainer(s => s.Font = OsuFont.GetFont(size: 20, weight: FontWeight.SemiBold))
+ {
+ AutoSizeAxes = Axes.Both,
+ Direction = FillDirection.Horizontal,
+ }
}
}
- },
- new Box
- {
- Anchor = Anchor.BottomLeft,
- Origin = Anchor.BottomLeft,
- RelativeSizeAxes = Axes.X,
- Height = 1,
- Colour = colours.Yellow
- },
- new Container
- {
- RelativeSizeAxes = Axes.Both,
- Padding = new MarginPadding { Horizontal = SearchableListOverlay.WIDTH_PADDING + OsuScreen.HORIZONTAL_OVERFLOW_PADDING },
- Children = new Drawable[]
- {
- new FillFlowContainer
- {
- AutoSizeAxes = Axes.Both,
- Padding = new MarginPadding { Top = 20 },
- Direction = FillDirection.Vertical,
- Children = new Drawable[]
- {
- new BeatmapTypeInfo(),
- modDisplay = new ModDisplay
- {
- Scale = new Vector2(0.75f),
- DisplayUnrankedText = false
- },
- }
- },
- new Container
- {
- Anchor = Anchor.TopRight,
- Origin = Anchor.TopRight,
- RelativeSizeAxes = Axes.Y,
- Width = 200,
- Padding = new MarginPadding { Vertical = 10 },
- Child = beatmapButton = new BeatmapSelectButton
- {
- RelativeSizeAxes = Axes.Both,
- Height = 1,
- },
- },
- Tabs = new MatchTabControl
- {
- Anchor = Anchor.BottomLeft,
- Origin = Anchor.BottomLeft,
- RelativeSizeAxes = Axes.X
- },
- },
- },
+ }
};
- beatmapButton.Action = () => RequestBeatmapSelection?.Invoke();
-
- Playlist.ItemsAdded += _ => updateMods();
- Playlist.ItemsRemoved += _ => updateMods();
-
- updateMods();
- }
-
- protected override void LoadComplete()
- {
- base.LoadComplete();
- ShowBeatmapPanel.BindValueChanged(value => beatmapPanel.FadeTo(value.NewValue ? 1 : 0, 200, Easing.OutQuint), true);
- }
-
- private void updateMods()
- {
- var item = Playlist.FirstOrDefault();
-
- modDisplay.Current.Value = item?.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
- }
-
- private class BeatmapSelectButton : HeaderButton
- {
- [Resolved(typeof(Room), nameof(Room.RoomID))]
- private Bindable<int?> roomId { get; set; }
-
- public BeatmapSelectButton()
+ Host.BindValueChanged(host =>
{
- Text = "Select beatmap";
- }
+ avatar.User = host.NewValue;
- [BackgroundDependencyLoader]
- private void load()
- {
- roomId.BindValueChanged(id => this.FadeTo(id.NewValue.HasValue ? 0 : 1), true);
- }
- }
+ hostText.Clear();
- private class HeaderBackgroundSprite : MultiplayerBackgroundSprite
- {
- protected override UpdateableBeatmapBackgroundSprite CreateBackgroundSprite() => new BackgroundSprite { RelativeSizeAxes = Axes.Both };
-
- private class BackgroundSprite : UpdateableBeatmapBackgroundSprite
- {
- protected override double TransformDuration => 200;
- }
+ if (host.NewValue != null)
+ {
+ hostText.AddText("hosted by ");
+ hostText.AddUserLink(host.NewValue);
+ }
+ }, true);
}
}
}
diff --git a/osu.Game/Screens/Multi/Match/Components/HeaderButton.cs b/osu.Game/Screens/Multi/Match/Components/HeaderButton.cs
deleted file mode 100644
index de6ece6a05..0000000000
--- a/osu.Game/Screens/Multi/Match/Components/HeaderButton.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
-
-namespace osu.Game.Screens.Multi.Match.Components
-{
- public class HeaderButton : TriangleButton
- {
- [BackgroundDependencyLoader]
- private void load()
- {
- BackgroundColour = OsuColour.FromHex(@"1187aa");
-
- Triangles.ColourLight = OsuColour.FromHex(@"277b9c");
- Triangles.ColourDark = OsuColour.FromHex(@"1f6682");
- Triangles.TriangleScale = 1.5f;
-
- Add(new Container
- {
- RelativeSizeAxes = Axes.Both,
- Alpha = 1f,
- Child = new Box
- {
- RelativeSizeAxes = Axes.Both,
- Alpha = 0.15f,
- Blending = BlendingParameters.Additive,
- },
- });
- }
-
- protected override SpriteText CreateText() => new OsuSpriteText
- {
- Depth = -1,
- Origin = Anchor.Centre,
- Anchor = Anchor.Centre,
- Font = OsuFont.GetFont(weight: FontWeight.Light, size: 30),
- };
- }
-}
diff --git a/osu.Game/Screens/Multi/Match/Components/HostInfo.cs b/osu.Game/Screens/Multi/Match/Components/HostInfo.cs
deleted file mode 100644
index 8851a96605..0000000000
--- a/osu.Game/Screens/Multi/Match/Components/HostInfo.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Users;
-using osu.Game.Users.Drawables;
-using osuTK;
-
-namespace osu.Game.Screens.Multi.Match.Components
-{
- public class HostInfo : CompositeDrawable
- {
- public readonly IBindable<User> Host = new Bindable<User>();
-
- private readonly LinkFlowContainer linkContainer;
- private readonly UpdateableAvatar avatar;
-
- public HostInfo()
- {
- AutoSizeAxes = Axes.X;
- Height = 50;
-
- InternalChild = new FillFlowContainer
- {
- AutoSizeAxes = Axes.Both,
- Direction = FillDirection.Horizontal,
- Spacing = new Vector2(5, 0),
- Children = new Drawable[]
- {
- avatar = new UpdateableAvatar { Size = new Vector2(50) },
- new FillFlowContainer
- {
- Anchor = Anchor.CentreLeft,
- Origin = Anchor.CentreLeft,
- AutoSizeAxes = Axes.Both,
- Direction = FillDirection.Vertical,
- Child = linkContainer = new LinkFlowContainer { AutoSizeAxes = Axes.Both }
- }
- }
- };
-
- Host.BindValueChanged(host => updateHost(host.NewValue));
- }
-
- private void updateHost(User host)
- {
- avatar.User = host;
-
- if (host != null)
- {
- linkContainer.AddText("hosted by");
- linkContainer.NewLine();
- linkContainer.AddUserLink(host, s => s.Font = s.Font.With(Typeface.Exo, weight: FontWeight.Bold, italics: true));
- }
- }
- }
-}
diff --git a/osu.Game/Screens/Multi/Match/Components/Info.cs b/osu.Game/Screens/Multi/Match/Components/Info.cs
deleted file mode 100644
index a320b08cc4..0000000000
--- a/osu.Game/Screens/Multi/Match/Components/Info.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using System.Linq;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Overlays.SearchableList;
-using osu.Game.Screens.Multi.Components;
-using osuTK;
-
-namespace osu.Game.Screens.Multi.Match.Components
-{
- public class Info : MultiplayerComposite
- {
- public Action OnStart;
-
- private ReadyButton readyButton;
-
- public Info()
- {
- RelativeSizeAxes = Axes.X;
- AutoSizeAxes = Axes.Y;
- }
-
- [BackgroundDependencyLoader]
- private void load()
- {
- HostInfo hostInfo;
-
- InternalChildren = new Drawable[]
- {
- new Box
- {
- RelativeSizeAxes = Axes.Both,
- Colour = OsuColour.FromHex(@"28242d"),
- },
- new Container
- {
- RelativeSizeAxes = Axes.X,
- AutoSizeAxes = Axes.Y,
- Padding = new MarginPadding { Horizontal = SearchableListOverlay.WIDTH_PADDING + OsuScreen.HORIZONTAL_OVERFLOW_PADDING },
- Children = new Drawable[]
- {
- new FillFlowContainer
- {
- AutoSizeAxes = Axes.Both,
- Direction = FillDirection.Vertical,
- Spacing = new Vector2(0, 10),
- Padding = new MarginPadding { Vertical = 20 },
- Children = new Drawable[]
- {
- new FillFlowContainer
- {
- AutoSizeAxes = Axes.Both,
- Direction = FillDirection.Vertical,
- Children = new Drawable[]
- {
- new OsuSpriteText
- {
- Font = OsuFont.GetFont(size: 30),
- Current = RoomName
- },
- new RoomStatusInfo(),
- }
- },
- hostInfo = new HostInfo(),
- },
- },
- new FillFlowContainer
- {
- Anchor = Anchor.CentreRight,
- Origin = Anchor.CentreRight,
- AutoSizeAxes = Axes.X,
- Height = 70,
- Spacing = new Vector2(10, 0),
- Direction = FillDirection.Horizontal,
- Children = new Drawable[]
- {
- readyButton = new ReadyButton
- {
- Action = () => OnStart?.Invoke()
- }
- }
- }
- },
- },
- };
-
- hostInfo.Host.BindTo(Host);
-
- Playlist.ItemsAdded += _ => updateBeatmap();
- Playlist.ItemsRemoved += _ => updateBeatmap();
-
- updateBeatmap();
- }
-
- private void updateBeatmap()
- {
- readyButton.Beatmap.Value = Playlist.FirstOrDefault()?.Beatmap.Value;
- }
- }
-}
diff --git a/osu.Game/Screens/Multi/Match/Components/LeaderboardChatDisplay.cs b/osu.Game/Screens/Multi/Match/Components/LeaderboardChatDisplay.cs
new file mode 100644
index 0000000000..de02b7f605
--- /dev/null
+++ b/osu.Game/Screens/Multi/Match/Components/LeaderboardChatDisplay.cs
@@ -0,0 +1,100 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Screens.Multi.Match.Components
+{
+ public class LeaderboardChatDisplay : MultiplayerComposite
+ {
+ private const double fade_duration = 100;
+
+ private readonly OsuTabControl<DisplayMode> tabControl;
+ private readonly MatchLeaderboard leaderboard;
+ private readonly MatchChatDisplay chat;
+
+ public LeaderboardChatDisplay()
+ {
+ RelativeSizeAxes = Axes.Both;
+
+ InternalChild = new GridContainer
+ {
+ RelativeSizeAxes = Axes.Both,
+ Content = new[]
+ {
+ new Drawable[]
+ {
+ tabControl = new DisplayModeTabControl
+ {
+ RelativeSizeAxes = Axes.X,
+ Height = 24,
+ }
+ },
+ new Drawable[]
+ {
+ new Container
+ {
+ RelativeSizeAxes = Axes.Both,
+ Padding = new MarginPadding { Top = 10 },
+ Children = new Drawable[]
+ {
+ leaderboard = new MatchLeaderboard { RelativeSizeAxes = Axes.Both },
+ chat = new MatchChatDisplay
+ {
+ RelativeSizeAxes = Axes.Both,
+ Alpha = 0
+ }
+ }
+ }
+ },
+ },
+ RowDimensions = new[]
+ {
+ new Dimension(GridSizeMode.AutoSize),
+ }
+ };
+ }
+
+ [BackgroundDependencyLoader]
+ private void load(OsuColour colours)
+ {
+ tabControl.AccentColour = colours.Yellow;
+ }
+
+ protected override void LoadComplete()
+ {
+ base.LoadComplete();
+
+ tabControl.Current.BindValueChanged(changeTab);
+ }
+
+ public void RefreshScores() => leaderboard.RefreshScores();
+
+ private void changeTab(ValueChangedEvent<DisplayMode> mode)
+ {
+ chat.FadeTo(mode.NewValue == DisplayMode.Chat ? 1 : 0, fade_duration);
+ leaderboard.FadeTo(mode.NewValue == DisplayMode.Leaderboard ? 1 : 0, fade_duration);
+ }
+
+ private class DisplayModeTabControl : OsuTabControl<DisplayMode>
+ {
+ protected override TabItem<DisplayMode> CreateTabItem(DisplayMode value) => base.CreateTabItem(value).With(d =>
+ {
+ d.Anchor = Anchor.Centre;
+ d.Origin = Anchor.Centre;
+ });
+ }
+
+ private enum DisplayMode
+ {
+ Leaderboard,
+ Chat,
+ }
+ }
+}
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchBeatmapPanel.cs b/osu.Game/Screens/Multi/Match/Components/MatchBeatmapPanel.cs
deleted file mode 100644
index c8de066caa..0000000000
--- a/osu.Game/Screens/Multi/Match/Components/MatchBeatmapPanel.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System.Linq;
-using System.Threading;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
-using osu.Game.Overlays.Direct;
-using osu.Game.Rulesets;
-
-namespace osu.Game.Screens.Multi.Match.Components
-{
- public class MatchBeatmapPanel : MultiplayerComposite
- {
- [Resolved]
- private IAPIProvider api { get; set; }
-
- [Resolved]
- private RulesetStore rulesets { get; set; }
-
- private CancellationTokenSource loadCancellation;
- private GetBeatmapSetRequest request;
- private DirectGridPanel panel;
-
- public MatchBeatmapPanel()
- {
- AutoSizeAxes = Axes.Both;
- }
-
- [BackgroundDependencyLoader]
- private void load()
- {
- Playlist.ItemsAdded += _ => loadNewPanel();
- Playlist.ItemsRemoved += _ => loadNewPanel();
-
- loadNewPanel();
- }
-
- private void loadNewPanel()
- {
- loadCancellation?.Cancel();
- request?.Cancel();
-
- panel?.FadeOut(200);
- panel?.Expire();
- panel = null;
-
- var beatmap = Playlist.FirstOrDefault()?.Beatmap.Value;
-
- if (beatmap?.OnlineBeatmapID == null)
- return;
-
- loadCancellation = new CancellationTokenSource();
-
- request = new GetBeatmapSetRequest(beatmap.OnlineBeatmapID.Value, BeatmapSetLookupType.BeatmapId);
- request.Success += res => Schedule(() =>
- {
- panel = new DirectGridPanel(res.ToBeatmapSet(rulesets));
- LoadComponentAsync(panel, AddInternal, loadCancellation.Token);
- });
-
- api.Queue(request);
- }
- }
-}
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchPage.cs b/osu.Game/Screens/Multi/Match/Components/MatchPage.cs
deleted file mode 100644
index fc98db157b..0000000000
--- a/osu.Game/Screens/Multi/Match/Components/MatchPage.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Bindables;
-
-namespace osu.Game.Screens.Multi.Match.Components
-{
- public abstract class MatchPage
- {
- public abstract string Name { get; }
-
- public readonly BindableBool Enabled = new BindableBool(true);
-
- public override string ToString() => Name;
- public override int GetHashCode() => GetType().GetHashCode();
- public override bool Equals(object obj) => GetType() == obj?.GetType();
- }
-
- public class SettingsMatchPage : MatchPage
- {
- public override string Name => "Settings";
- }
-
- public class RoomMatchPage : MatchPage
- {
- public override string Name => "Room";
- }
-}
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
index 410aaed788..8c005a2647 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Screens.Multi.Match.Components
private const float transition_duration = 350;
private const float field_padding = 45;
+ public Action EditPlaylist;
+
protected MatchSettings Settings { get; private set; }
[BackgroundDependencyLoader]
@@ -35,7 +37,8 @@ namespace osu.Game.Screens.Multi.Match.Components
Child = Settings = new MatchSettings
{
RelativeSizeAxes = Axes.Both,
- RelativePositionAxes = Axes.Y
+ RelativePositionAxes = Axes.Y,
+ EditPlaylist = () => EditPlaylist?.Invoke()
};
}
@@ -53,6 +56,8 @@ namespace osu.Game.Screens.Multi.Match.Components
{
private const float disabled_alpha = 0.2f;
+ public Action EditPlaylist;
+
public OsuTextBox NameField, MaxParticipantsField;
public OsuDropdown<TimeSpan> DurationField;
public RoomAvailabilityPicker AvailabilityPicker;
@@ -63,6 +68,7 @@ namespace osu.Game.Screens.Multi.Match.Components
private OsuSpriteText typeLabel;
private ProcessingOverlay processingOverlay;
+ private DrawableRoomPlaylist playlist;
[Resolved(CanBeNull = true)]
private IRoomManager manager { get; set; }
@@ -73,196 +79,235 @@ namespace osu.Game.Screens.Multi.Match.Components
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
+ Container dimContent;
+
InternalChildren = new Drawable[]
{
- new Box
+ dimContent = new Container
{
RelativeSizeAxes = Axes.Both,
- Colour = OsuColour.FromHex(@"28242d"),
- },
- new GridContainer
- {
- RelativeSizeAxes = Axes.Both,
- RowDimensions = new[]
+ Children = new Drawable[]
{
- new Dimension(GridSizeMode.Distributed),
- new Dimension(GridSizeMode.AutoSize),
- },
- Content = new[]
- {
- new Drawable[]
+ new Box
{
- new OsuScrollContainer
+ RelativeSizeAxes = Axes.Both,
+ Colour = OsuColour.FromHex(@"28242d"),
+ },
+ new GridContainer
+ {
+ RelativeSizeAxes = Axes.Both,
+ RowDimensions = new[]
{
- Padding = new MarginPadding
+ new Dimension(GridSizeMode.Distributed),
+ new Dimension(GridSizeMode.AutoSize),
+ },
+ Content = new[]
+ {
+ new Drawable[]
{
- Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
- Vertical = 10
- },
- RelativeSizeAxes = Axes.Both,
- Children = new[]
- {
- new Container
+ new OsuScrollContainer
{
- Padding = new MarginPadding { Horizontal = SearchableListOverlay.WIDTH_PADDING },
- RelativeSizeAxes = Axes.X,
- AutoSizeAxes = Axes.Y,
- Children = new Drawable[]
+ Padding = new MarginPadding
{
- new SectionContainer
+ Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
+ Vertical = 10
+ },
+ RelativeSizeAxes = Axes.Both,
+ Children = new[]
+ {
+ new Container
{
- Padding = new MarginPadding { Right = field_padding / 2 },
- Children = new[]
+ Padding = new MarginPadding { Horizontal = SearchableListOverlay.WIDTH_PADDING },
+ RelativeSizeAxes = Axes.X,
+ AutoSizeAxes = Axes.Y,
+ Children = new Drawable[]
{
- new Section("Room name")
+ new SectionContainer
{
- Child = NameField = new SettingsTextBox
+ Padding = new MarginPadding { Right = field_padding / 2 },
+ Children = new[]
{
- RelativeSizeAxes = Axes.X,
- TabbableContentContainer = this,
- OnCommit = (sender, text) => apply(),
- },
- },
- new Section("Room visibility")
- {
- Alpha = disabled_alpha,
- Child = AvailabilityPicker = new RoomAvailabilityPicker
- {
- Enabled = { Value = false }
- },
- },
- new Section("Game type")
- {
- Alpha = disabled_alpha,
- Child = new FillFlowContainer
- {
- AutoSizeAxes = Axes.Y,
- RelativeSizeAxes = Axes.X,
- Direction = FillDirection.Vertical,
- Spacing = new Vector2(7),
- Children = new Drawable[]
+ new Section("Room name")
{
- TypePicker = new GameTypePicker
+ Child = NameField = new SettingsTextBox
{
RelativeSizeAxes = Axes.X,
+ TabbableContentContainer = this,
+ OnCommit = (sender, text) => apply(),
+ },
+ },
+ new Section("Duration")
+ {
+ Child = DurationField = new DurationDropdown
+ {
+ RelativeSizeAxes = Axes.X,
+ Items = new[]
+ {
+ TimeSpan.FromMinutes(30),
+ TimeSpan.FromHours(1),
+ TimeSpan.FromHours(2),
+ TimeSpan.FromHours(4),
+ TimeSpan.FromHours(8),
+ TimeSpan.FromHours(12),
+ //TimeSpan.FromHours(16),
+ TimeSpan.FromHours(24),
+ TimeSpan.FromDays(3),
+ TimeSpan.FromDays(7)
+ }
+ }
+ },
+ new Section("Room visibility")
+ {
+ Alpha = disabled_alpha,
+ Child = AvailabilityPicker = new RoomAvailabilityPicker
+ {
Enabled = { Value = false }
},
- typeLabel = new OsuSpriteText
+ },
+ new Section("Game type")
+ {
+ Alpha = disabled_alpha,
+ Child = new FillFlowContainer
{
- Font = OsuFont.GetFont(size: 14),
- Colour = colours.Yellow
+ AutoSizeAxes = Axes.Y,
+ RelativeSizeAxes = Axes.X,
+ Direction = FillDirection.Vertical,
+ Spacing = new Vector2(7),
+ Children = new Drawable[]
+ {
+ TypePicker = new GameTypePicker
+ {
+ RelativeSizeAxes = Axes.X,
+ Enabled = { Value = false }
+ },
+ typeLabel = new OsuSpriteText
+ {
+ Font = OsuFont.GetFont(size: 14),
+ Colour = colours.Yellow
+ },
+ },
+ },
+ },
+ new Section("Max participants")
+ {
+ Alpha = disabled_alpha,
+ Child = MaxParticipantsField = new SettingsNumberTextBox
+ {
+ RelativeSizeAxes = Axes.X,
+ TabbableContentContainer = this,
+ ReadOnly = true,
+ OnCommit = (sender, text) => apply()
+ },
+ },
+ new Section("Password (optional)")
+ {
+ Alpha = disabled_alpha,
+ Child = new SettingsPasswordTextBox
+ {
+ RelativeSizeAxes = Axes.X,
+ TabbableContentContainer = this,
+ ReadOnly = true,
+ OnCommit = (sender, text) => apply()
},
},
},
},
- },
- },
- new SectionContainer
- {
- Anchor = Anchor.TopRight,
- Origin = Anchor.TopRight,
- Padding = new MarginPadding { Left = field_padding / 2 },
- Children = new[]
- {
- new Section("Max participants")
+ new SectionContainer
{
- Alpha = disabled_alpha,
- Child = MaxParticipantsField = new SettingsNumberTextBox
+ Anchor = Anchor.TopRight,
+ Origin = Anchor.TopRight,
+ Padding = new MarginPadding { Left = field_padding / 2 },
+ Children = new[]
{
- RelativeSizeAxes = Axes.X,
- TabbableContentContainer = this,
- ReadOnly = true,
- OnCommit = (sender, text) => apply()
- },
- },
- new Section("Duration")
- {
- Child = DurationField = new DurationDropdown
- {
- RelativeSizeAxes = Axes.X,
- Items = new[]
+ new Section("Playlist")
{
- TimeSpan.FromMinutes(30),
- TimeSpan.FromHours(1),
- TimeSpan.FromHours(2),
- TimeSpan.FromHours(4),
- TimeSpan.FromHours(8),
- TimeSpan.FromHours(12),
- //TimeSpan.FromHours(16),
- TimeSpan.FromHours(24),
- TimeSpan.FromDays(3),
- TimeSpan.FromDays(7)
- }
- }
- },
- new Section("Password (optional)")
- {
- Alpha = disabled_alpha,
- Child = new SettingsPasswordTextBox
- {
- RelativeSizeAxes = Axes.X,
- TabbableContentContainer = this,
- ReadOnly = true,
- OnCommit = (sender, text) => apply()
+ Child = new GridContainer
+ {
+ RelativeSizeAxes = Axes.X,
+ Height = 300,
+ Content = new[]
+ {
+ new Drawable[]
+ {
+ playlist = new DrawableRoomPlaylist(true, true) { RelativeSizeAxes = Axes.Both }
+ },
+ new Drawable[]
+ {
+ new PurpleTriangleButton
+ {
+ RelativeSizeAxes = Axes.X,
+ Height = 40,
+ Text = "Edit playlist",
+ Action = () => EditPlaylist?.Invoke()
+ }
+ }
+ },
+ RowDimensions = new[]
+ {
+ new Dimension(),
+ new Dimension(GridSizeMode.AutoSize),
+ }
+ }
+ },
},
},
},
- },
+ }
},
- }
- },
- },
- },
- new Drawable[]
- {
- new Container
- {
- Anchor = Anchor.BottomLeft,
- Origin = Anchor.BottomLeft,
- Y = 2,
- RelativeSizeAxes = Axes.X,
- AutoSizeAxes = Axes.Y,
- Children = new Drawable[]
- {
- new Box
- {
- RelativeSizeAxes = Axes.Both,
- Colour = OsuColour.FromHex(@"28242d").Darken(0.5f).Opacity(1f),
},
- new FillFlowContainer
+ },
+ new Drawable[]
+ {
+ new Container
{
+ Anchor = Anchor.BottomLeft,
+ Origin = Anchor.BottomLeft,
+ Y = 2,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
- Direction = FillDirection.Vertical,
- Spacing = new Vector2(0, 20),
- Margin = new MarginPadding { Vertical = 20 },
- Padding = new MarginPadding { Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING },
Children = new Drawable[]
{
- ApplyButton = new CreateRoomButton
+ new Box
{
- Anchor = Anchor.BottomCentre,
- Origin = Anchor.BottomCentre,
- Size = new Vector2(230, 55),
- Enabled = { Value = false },
- Action = apply,
+ RelativeSizeAxes = Axes.Both,
+ Colour = OsuColour.FromHex(@"28242d").Darken(0.5f).Opacity(1f),
},
- ErrorText = new OsuSpriteText
+ new FillFlowContainer
{
- Anchor = Anchor.BottomCentre,
- Origin = Anchor.BottomCentre,
- Alpha = 0,
- Depth = 1,
- Colour = colours.RedDark
+ RelativeSizeAxes = Axes.X,
+ AutoSizeAxes = Axes.Y,
+ Direction = FillDirection.Vertical,
+ Spacing = new Vector2(0, 20),
+ Margin = new MarginPadding { Vertical = 20 },
+ Padding = new MarginPadding { Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING },
+ Children = new Drawable[]
+ {
+ ApplyButton = new CreateRoomButton
+ {
+ Anchor = Anchor.BottomCentre,
+ Origin = Anchor.BottomCentre,
+ Size = new Vector2(230, 55),
+ Enabled = { Value = false },
+ Action = apply,
+ },
+ ErrorText = new OsuSpriteText
+ {
+ Anchor = Anchor.BottomCentre,
+ Origin = Anchor.BottomCentre,
+ Alpha = 0,
+ Depth = 1,
+ Colour = colours.RedDark
+ }
+ }
}
}
}
}
}
- }
+ },
}
},
- processingOverlay = new ProcessingOverlay { Alpha = 0 }
+ processingOverlay = new ProcessingOverlay(dimContent)
};
TypePicker.Current.BindValueChanged(type => typeLabel.Text = type.NewValue?.Name ?? string.Empty, true);
@@ -271,6 +316,8 @@ namespace osu.Game.Screens.Multi.Match.Components
Type.BindValueChanged(type => TypePicker.Current.Value = type.NewValue, true);
MaxParticipants.BindValueChanged(count => MaxParticipantsField.Text = count.NewValue?.ToString(), true);
Duration.BindValueChanged(duration => DurationField.Current.Value = duration.NewValue, true);
+
+ playlist.Items.BindTo(Playlist);
}
protected override void Update()
@@ -409,10 +456,7 @@ namespace osu.Game.Screens.Multi.Match.Components
Menu.MaxHeight = 100;
}
- protected override string GenerateItemText(TimeSpan item)
- {
- return item.Humanize();
- }
+ protected override string GenerateItemText(TimeSpan item) => item.Humanize();
}
}
}
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchTabControl.cs b/osu.Game/Screens/Multi/Match/Components/MatchTabControl.cs
deleted file mode 100644
index c700d7b88a..0000000000
--- a/osu.Game/Screens/Multi/Match/Components/MatchTabControl.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Input.Events;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Multiplayer;
-using osuTK.Graphics;
-
-namespace osu.Game.Screens.Multi.Match.Components
-{
- public class MatchTabControl : PageTabControl<MatchPage>
- {
- [Resolved(typeof(Room), nameof(Room.RoomID))]
- private Bindable<int?> roomId { get; set; }
-
- public MatchTabControl()
- {
- AddItem(new RoomMatchPage());
- AddItem(new SettingsMatchPage());
- }
-
- [BackgroundDependencyLoader]
- private void load()
- {
- roomId.BindValueChanged(id =>
- {
- if (id.NewValue.HasValue)
- {
- Items.ForEach(t => t.Enabled.Value = !(t is SettingsMatchPage));
- Current.Value = new RoomMatchPage();
- }
- else
- {
- Items.ForEach(t => t.Enabled.Value = t is SettingsMatchPage);
- Current.Value = new SettingsMatchPage();
- }
- }, true);
- }
-
- protected override TabItem<MatchPage> CreateTabItem(MatchPage value) => new TabItem(value);
-
- private class TabItem : PageTabItem
- {
- private readonly IBindable<bool> enabled = new BindableBool();
-
- public TabItem(MatchPage value)
- : base(value)
- {
- enabled.BindTo(value.Enabled);
- enabled.BindValueChanged(enabled => Colour = enabled.NewValue ? Color4.White : Color4.Gray, true);
- }
-
- protected override bool OnClick(ClickEvent e)
- {
- if (!enabled.Value)
- return true;
-
- return base.OnClick(e);
- }
- }
- }
-}
diff --git a/osu.Game/Screens/Multi/Match/Components/Participants.cs b/osu.Game/Screens/Multi/Match/Components/Participants.cs
deleted file mode 100644
index 00d2f3e150..0000000000
--- a/osu.Game/Screens/Multi/Match/Components/Participants.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System.Linq;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics.Containers;
-using osu.Game.Overlays.SearchableList;
-using osu.Game.Screens.Multi.Components;
-using osu.Game.Users;
-using osuTK;
-
-namespace osu.Game.Screens.Multi.Match.Components
-{
- public class Participants : MultiplayerComposite
- {
- [BackgroundDependencyLoader]
- private void load()
- {
- FillFlowContainer<UserPanel> usersFlow;
-
- InternalChild = new Container
- {
- RelativeSizeAxes = Axes.Both,
- Padding = new MarginPadding { Horizontal = SearchableListOverlay.WIDTH_PADDING },
- Children = new Drawable[]
- {
- new OsuScrollContainer
- {
- RelativeSizeAxes = Axes.Both,
- Padding = new MarginPadding { Top = 10 },
- Children = new Drawable[]
- {
- new ParticipantCountDisplay
- {
- Anchor = Anchor.TopRight,
- Origin = Anchor.TopRight,
- },
- usersFlow = new FillFlowContainer<UserPanel>
- {
- RelativeSizeAxes = Axes.X,
- AutoSizeAxes = Axes.Y,
- Spacing = new Vector2(5),
- Padding = new MarginPadding { Top = 40 },
- LayoutDuration = 200,
- LayoutEasing = Easing.OutQuint,
- },
- },
- },
- },
- };
-
- Participants.ItemsAdded += users =>
- {
- usersFlow.AddRange(users.Select(u =>
- {
- var panel = new UserPanel(u)
- {
- Anchor = Anchor.TopCentre,
- Origin = Anchor.TopCentre,
- Width = 300,
- };
-
- panel.OnLoadComplete += d => d.FadeInFromZero(60);
-
- return panel;
- }).ToList());
- };
-
- Participants.ItemsRemoved += users =>
- {
- usersFlow.RemoveAll(p => users.Contains(p.User));
- };
- }
- }
-}
diff --git a/osu.Game/Screens/Multi/Match/Components/PurpleTriangleButton.cs b/osu.Game/Screens/Multi/Match/Components/PurpleTriangleButton.cs
new file mode 100644
index 0000000000..8a0369ceba
--- /dev/null
+++ b/osu.Game/Screens/Multi/Match/Components/PurpleTriangleButton.cs
@@ -0,0 +1,20 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Screens.Multi.Match.Components
+{
+ public class PurpleTriangleButton : TriangleButton
+ {
+ [BackgroundDependencyLoader]
+ private void load()
+ {
+ BackgroundColour = OsuColour.FromHex(@"593790");
+ Triangles.ColourLight = OsuColour.FromHex(@"7247b6");
+ Triangles.ColourDark = OsuColour.FromHex(@"593790");
+ }
+ }
+}
diff --git a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
index 8ab0b8f61f..8f484d3672 100644
--- a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
+++ b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
@@ -5,16 +5,16 @@ using System;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
-using osu.Framework.Graphics;
using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Multiplayer;
-using osuTK;
namespace osu.Game.Screens.Multi.Match.Components
{
- public class ReadyButton : HeaderButton
+ public class ReadyButton : TriangleButton
{
- public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
+ public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
[Resolved(typeof(Room), nameof(Room.EndDate))]
private Bindable<DateTimeOffset> endDate { get; set; }
@@ -29,43 +29,50 @@ namespace osu.Game.Screens.Multi.Match.Components
public ReadyButton()
{
- RelativeSizeAxes = Axes.Y;
- Size = new Vector2(200, 1);
-
Text = "Start";
}
[BackgroundDependencyLoader]
- private void load()
+ private void load(OsuColour colours)
{
beatmaps.ItemAdded += beatmapAdded;
beatmaps.ItemRemoved += beatmapRemoved;
- Beatmap.BindValueChanged(b => updateBeatmap(b.NewValue), true);
+ SelectedItem.BindValueChanged(item => updateSelectedItem(item.NewValue), true);
+
+ BackgroundColour = colours.Green;
+ Triangles.ColourDark = colours.Green;
+ Triangles.ColourLight = colours.GreenLight;
}
- private void updateBeatmap(BeatmapInfo beatmap)
+ private void updateSelectedItem(PlaylistItem item)
{
hasBeatmap = false;
- if (beatmap?.OnlineBeatmapID == null)
+ int? beatmapId = SelectedItem.Value?.Beatmap.Value?.OnlineBeatmapID;
+ if (beatmapId == null)
return;
- hasBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmap.OnlineBeatmapID) != null;
+ hasBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId) != null;
}
private void beatmapAdded(BeatmapSetInfo model)
{
- if (model.Beatmaps.Any(b => b.OnlineBeatmapID == Beatmap.Value.OnlineBeatmapID))
+ int? beatmapId = SelectedItem.Value?.Beatmap.Value?.OnlineBeatmapID;
+ if (beatmapId == null)
+ return;
+
+ if (model.Beatmaps.Any(b => b.OnlineBeatmapID == beatmapId))
Schedule(() => hasBeatmap = true);
}
private void beatmapRemoved(BeatmapSetInfo model)
{
- if (Beatmap.Value == null)
+ int? beatmapId = SelectedItem.Value?.Beatmap.Value?.OnlineBeatmapID;
+ if (beatmapId == null)
return;
- if (model.OnlineBeatmapSetID == Beatmap.Value.BeatmapSet.OnlineBeatmapSetID)
+ if (model.Beatmaps.Any(b => b.OnlineBeatmapID == beatmapId))
Schedule(() => hasBeatmap = false);
}
@@ -78,7 +85,7 @@ namespace osu.Game.Screens.Multi.Match.Components
private void updateEnabledState()
{
- if (gameBeatmap.Value == null)
+ if (gameBeatmap.Value == null || SelectedItem.Value == null)
{
Enabled.Value = false;
return;
@@ -94,7 +101,10 @@ namespace osu.Game.Screens.Multi.Match.Components
base.Dispose(isDisposing);
if (beatmaps != null)
+ {
beatmaps.ItemAdded -= beatmapAdded;
+ beatmaps.ItemRemoved -= beatmapRemoved;
+ }
}
}
}
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index 890664e99b..eef53126c0 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -13,10 +13,11 @@ using osu.Game.Beatmaps;
using osu.Game.Online.Multiplayer;
using osu.Game.Online.Multiplayer.GameTypes;
using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Multi.Components;
using osu.Game.Screens.Multi.Match.Components;
using osu.Game.Screens.Multi.Play;
using osu.Game.Screens.Select;
-using PlaylistItem = osu.Game.Online.Multiplayer.PlaylistItem;
+using Footer = osu.Game.Screens.Multi.Match.Components.Footer;
namespace osu.Game.Screens.Multi.Match
{
@@ -32,26 +33,22 @@ namespace osu.Game.Screens.Multi.Match
[Resolved(typeof(Room), nameof(Room.RoomID))]
private Bindable<int?> roomId { get; set; }
- [Resolved(typeof(Room), nameof(Room.Name))]
- private Bindable<string> name { get; set; }
-
[Resolved(typeof(Room), nameof(Room.Type))]
private Bindable<GameType> type { get; set; }
- [Resolved(typeof(Room))]
- protected BindableList<PlaylistItem> Playlist { get; private set; }
+ [Resolved(typeof(Room), nameof(Room.Playlist))]
+ private BindableList<PlaylistItem> playlist { get; set; }
[Resolved]
private BeatmapManager beatmapManager { get; set; }
- [Resolved]
- private PreviewTrackManager previewTrackManager { get; set; }
+ [Resolved(canBeNull: true)]
+ private Multiplayer multiplayer { get; set; }
- [Resolved(CanBeNull = true)]
- private OsuGame game { get; set; }
+ protected readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
- private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
- private MatchLeaderboard leaderboard;
+ private LeaderboardChatDisplay leaderboardChatDisplay;
+ private MatchSettingsOverlay settingsOverlay;
public MatchSubScreen(Room room)
{
@@ -61,11 +58,6 @@ namespace osu.Game.Screens.Multi.Match
[BackgroundDependencyLoader]
private void load()
{
- Components.Header header;
- Info info;
- GridContainer bottomRow;
- MatchSettingsOverlay settings;
-
InternalChildren = new Drawable[]
{
new GridContainer
@@ -75,167 +67,170 @@ namespace osu.Game.Screens.Multi.Match
{
new Drawable[]
{
- header = new Components.Header
+ new Container
{
- Depth = -1,
- RequestBeatmapSelection = () =>
+ RelativeSizeAxes = Axes.Both,
+ Padding = new MarginPadding
{
- this.Push(new MatchSongSelect
+ Horizontal = 105,
+ Vertical = 20
+ },
+ Child = new GridContainer
+ {
+ RelativeSizeAxes = Axes.Both,
+ Content = new[]
{
- Selected = item =>
+ new Drawable[] { new Components.Header() },
+ new Drawable[]
{
- Playlist.Clear();
- Playlist.Add(item);
+ new Container
+ {
+ RelativeSizeAxes = Axes.Both,
+ Padding = new MarginPadding { Top = 65 },
+ Child = new GridContainer
+ {
+ ColumnDimensions = new[]
+ {
+ new Dimension(minSize: 160),
+ new Dimension(minSize: 360),
+ new Dimension(minSize: 400),
+ },
+ RelativeSizeAxes = Axes.Both,
+ Content = new[]
+ {
+ new Drawable[]
+ {
+ new Container
+ {
+ RelativeSizeAxes = Axes.Both,
+ Padding = new MarginPadding { Right = 5 },
+ Child = new OverlinedParticipants(Direction.Vertical) { RelativeSizeAxes = Axes.Both }
+ },
+ new Container
+ {
+ RelativeSizeAxes = Axes.Both,
+ Padding = new MarginPadding { Horizontal = 5 },
+ Child = new OverlinedPlaylist(true) // Temporarily always allow selection
+ {
+ RelativeSizeAxes = Axes.Both,
+ SelectedItem = { BindTarget = SelectedItem }
+ }
+ },
+ new Container
+ {
+ RelativeSizeAxes = Axes.Both,
+ Padding = new MarginPadding { Left = 5 },
+ Child = leaderboardChatDisplay = new LeaderboardChatDisplay()
+ }
+ },
+ }
+ }
+ }
}
- });
+ },
+ RowDimensions = new[]
+ {
+ new Dimension(GridSizeMode.AutoSize),
+ new Dimension(),
+ }
}
}
},
- new Drawable[] { info = new Info { OnStart = onStart } },
new Drawable[]
{
- bottomRow = new GridContainer
+ new Footer
{
- RelativeSizeAxes = Axes.Both,
- Content = new[]
- {
- new Drawable[]
- {
- leaderboard = new MatchLeaderboard
- {
- Padding = new MarginPadding
- {
- Left = 10 + HORIZONTAL_OVERFLOW_PADDING,
- Right = 10,
- Vertical = 10,
- },
- RelativeSizeAxes = Axes.Both
- },
- new Container
- {
- Padding = new MarginPadding
- {
- Left = 10,
- Right = 10 + HORIZONTAL_OVERFLOW_PADDING,
- Vertical = 10,
- },
- RelativeSizeAxes = Axes.Both,
- Child = new MatchChatDisplay
- {
- RelativeSizeAxes = Axes.Both
- }
- },
- },
- },
+ OnStart = onStart,
+ SelectedItem = { BindTarget = SelectedItem }
}
- },
+ }
},
RowDimensions = new[]
{
+ new Dimension(),
new Dimension(GridSizeMode.AutoSize),
- new Dimension(GridSizeMode.AutoSize),
- new Dimension(GridSizeMode.Distributed),
}
},
- new Container
+ settingsOverlay = new MatchSettingsOverlay
{
RelativeSizeAxes = Axes.Both,
- Padding = new MarginPadding { Top = Components.Header.HEIGHT },
- Child = settings = new MatchSettingsOverlay { RelativeSizeAxes = Axes.Both },
- },
+ EditPlaylist = () => this.Push(new MatchSongSelect()),
+ State = { Value = roomId.Value == null ? Visibility.Visible : Visibility.Hidden }
+ }
};
-
- header.Tabs.Current.BindValueChanged(tab =>
- {
- const float fade_duration = 500;
-
- var settingsDisplayed = tab.NewValue is SettingsMatchPage;
-
- header.ShowBeatmapPanel.Value = !settingsDisplayed;
- settings.State.Value = settingsDisplayed ? Visibility.Visible : Visibility.Hidden;
- info.FadeTo(settingsDisplayed ? 0 : 1, fade_duration, Easing.OutQuint);
- bottomRow.FadeTo(settingsDisplayed ? 0 : 1, fade_duration, Easing.OutQuint);
- }, true);
-
- beatmapManager.ItemAdded += beatmapAdded;
}
protected override void LoadComplete()
{
base.LoadComplete();
- Playlist.ItemsAdded += _ => updateSelectedItem();
- Playlist.ItemsRemoved += _ => updateSelectedItem();
+ roomId.BindValueChanged(id =>
+ {
+ if (id.NewValue == null)
+ settingsOverlay.Show();
+ else
+ {
+ settingsOverlay.Hide();
- updateSelectedItem();
- }
+ // Set the first playlist item.
+ // This is scheduled since updating the room and playlist may happen in an arbitrary order (via Room.CopyFrom()).
+ Schedule(() => SelectedItem.Value = playlist.FirstOrDefault());
+ }
+ }, true);
- private void updateSelectedItem()
- {
- selectedItem.Value = Playlist.FirstOrDefault();
- currentItemChanged();
+ SelectedItem.BindValueChanged(_ => Scheduler.AddOnce(selectedItemChanged));
+ SelectedItem.Value = playlist.FirstOrDefault();
+
+ beatmapManager.ItemAdded += beatmapAdded;
}
public override bool OnExiting(IScreen next)
{
RoomManager?.PartRoom();
Mods.Value = Array.Empty<Mod>();
- previewTrackManager.StopAnyPlaying(this);
return base.OnExiting(next);
}
- /// <summary>
- /// Handles propagation of the current playlist item's content to game-wide mechanisms.
- /// </summary>
- private void currentItemChanged()
+ private void selectedItemChanged()
{
- var item = selectedItem.Value;
+ updateWorkingBeatmap();
- // Retrieve the corresponding local beatmap, since we can't directly use the playlist's beatmap info
- var localBeatmap = item?.Beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == item.Beatmap.Value.OnlineBeatmapID);
+ var item = SelectedItem.Value;
- Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
Mods.Value = item?.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
if (item?.Ruleset != null)
Ruleset.Value = item.Ruleset.Value;
-
- previewTrackManager.StopAnyPlaying(this);
}
- /// <summary>
- /// Handle the case where a beatmap is imported (and can be used by this match).
- /// </summary>
+ private void updateWorkingBeatmap()
+ {
+ var beatmap = SelectedItem.Value?.Beatmap.Value;
+
+ // Retrieve the corresponding local beatmap, since we can't directly use the playlist's beatmap info
+ var localBeatmap = beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == beatmap.OnlineBeatmapID);
+
+ Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
+ }
+
private void beatmapAdded(BeatmapSetInfo model) => Schedule(() =>
{
if (Beatmap.Value != beatmapManager.DefaultBeatmap)
return;
- if (selectedItem.Value == null)
- return;
-
- // Try to retrieve the corresponding local beatmap
- var localBeatmap = beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == selectedItem.Value.Beatmap.Value.OnlineBeatmapID);
-
- if (localBeatmap != null)
- Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
+ updateWorkingBeatmap();
});
- [Resolved(canBeNull: true)]
- private Multiplayer multiplayer { get; set; }
-
private void onStart()
{
- previewTrackManager.StopAnyPlaying(this);
-
switch (type.Value)
{
default:
case GameTypeTimeshift _:
- multiplayer?.Start(() => new TimeshiftPlayer(selectedItem.Value)
+ multiplayer?.Start(() => new TimeshiftPlayer(SelectedItem.Value)
{
- Exited = () => leaderboard.RefreshScores()
+ Exited = () => leaderboardChatDisplay.RefreshScores()
});
break;
}
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 2277157134..1219919425 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -4,24 +4,27 @@
using System;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Logging;
using osu.Framework.Screens;
using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawables;
using osu.Game.Graphics;
-using osu.Game.Graphics.Backgrounds;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
using osu.Game.Input;
using osu.Game.Online.API;
using osu.Game.Online.Multiplayer;
-using osu.Game.Overlays.BeatmapSet.Buttons;
using osu.Game.Screens.Menu;
+using osu.Game.Screens.Multi.Components;
using osu.Game.Screens.Multi.Lounge;
using osu.Game.Screens.Multi.Lounge.Components;
using osu.Game.Screens.Multi.Match;
+using osu.Game.Screens.Multi.Match.Components;
using osu.Game.Screens.Play;
using osuTK;
@@ -62,6 +65,9 @@ namespace osu.Game.Screens.Multi
[Resolved(CanBeNull = true)]
private OsuLogo logo { get; set; }
+ private readonly Drawable header;
+ private readonly Drawable headerBackground;
+
public Multiplayer()
{
Anchor = Anchor.Centre;
@@ -69,54 +75,65 @@ namespace osu.Game.Screens.Multi
RelativeSizeAxes = Axes.Both;
Padding = new MarginPadding { Horizontal = -HORIZONTAL_OVERFLOW_PADDING };
+ var backgroundColour = OsuColour.FromHex(@"3e3a44");
+
InternalChild = waves = new MultiplayerWaveContainer
{
RelativeSizeAxes = Axes.Both,
Children = new Drawable[]
{
- new Container
+ new Box
{
RelativeSizeAxes = Axes.Both,
- Masking = true,
- Children = new Drawable[]
- {
- new Box
- {
- RelativeSizeAxes = Axes.Both,
- Colour = OsuColour.FromHex(@"3e3a44"),
- },
- new Triangles
- {
- RelativeSizeAxes = Axes.Both,
- ColourLight = OsuColour.FromHex(@"3c3842"),
- ColourDark = OsuColour.FromHex(@"393540"),
- TriangleScale = 5,
- },
- },
+ Colour = backgroundColour,
},
new Container
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Top = Header.HEIGHT },
- Child = screenStack = new MultiplayerSubScreenStack { RelativeSizeAxes = Axes.Both }
+ Children = new[]
+ {
+ header = new Container
+ {
+ RelativeSizeAxes = Axes.X,
+ Height = 400,
+ Children = new[]
+ {
+ headerBackground = new Container
+ {
+ RelativeSizeAxes = Axes.Both,
+ Width = 1.25f,
+ Masking = true,
+ Children = new Drawable[]
+ {
+ new HeaderBackgroundSprite
+ {
+ RelativeSizeAxes = Axes.X,
+ Height = 400 // Keep a static height so the header doesn't change as it's resized between subscreens
+ },
+ }
+ },
+ new Container
+ {
+ RelativeSizeAxes = Axes.Both,
+ Padding = new MarginPadding { Bottom = -1 }, // 1px padding to avoid a 1px gap due to masking
+ Child = new Box
+ {
+ RelativeSizeAxes = Axes.Both,
+ Colour = ColourInfo.GradientVertical(backgroundColour.Opacity(0.7f), backgroundColour)
+ },
+ }
+ }
+ },
+ screenStack = new MultiplayerSubScreenStack { RelativeSizeAxes = Axes.Both }
+ }
},
new Header(screenStack),
- createButton = new HeaderButton
+ createButton = new CreateRoomButton
{
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
- RelativeSizeAxes = Axes.None,
- Size = new Vector2(150, Header.HEIGHT - 20),
- Margin = new MarginPadding
- {
- Top = 10,
- Right = 10 + HORIZONTAL_OVERFLOW_PADDING,
- },
- Text = "Create room",
- Action = () => loungeSubScreen.Open(new Room
- {
- Name = { Value = $"{api.LocalUser}'s awesome room" }
- }),
+ Action = createRoom
},
roomManager = new RoomManager()
}
@@ -248,6 +265,11 @@ namespace osu.Game.Screens.Multi
logo.Delay(WaveContainer.DISAPPEAR_DURATION / 2).FadeOut();
}
+ private void createRoom()
+ {
+ loungeSubScreen.Open(new Room { Name = { Value = $"{api.LocalUser}'s awesome room" } });
+ }
+
private void beginHandlingTrack()
{
Beatmap.BindValueChanged(updateTrack, true);
@@ -259,7 +281,10 @@ namespace osu.Game.Screens.Multi
Beatmap.ValueChanged -= updateTrack;
}
- private void screenPushed(IScreen lastScreen, IScreen newScreen) => subScreenChanged(newScreen);
+ private void screenPushed(IScreen lastScreen, IScreen newScreen)
+ {
+ subScreenChanged(newScreen);
+ }
private void screenExited(IScreen lastScreen, IScreen newScreen)
{
@@ -271,6 +296,19 @@ namespace osu.Game.Screens.Multi
private void subScreenChanged(IScreen newScreen)
{
+ switch (newScreen)
+ {
+ case LoungeSubScreen _:
+ header.Delay(MultiplayerSubScreen.RESUME_TRANSITION_DELAY).ResizeHeightTo(400, MultiplayerSubScreen.APPEAR_DURATION, Easing.OutQuint);
+ headerBackground.MoveToX(0, MultiplayerSubScreen.X_MOVE_DURATION, Easing.OutQuint);
+ break;
+
+ case MatchSubScreen _:
+ header.ResizeHeightTo(135, MultiplayerSubScreen.APPEAR_DURATION, Easing.OutQuint);
+ headerBackground.MoveToX(-MultiplayerSubScreen.X_SHIFT, MultiplayerSubScreen.X_MOVE_DURATION, Easing.OutQuint);
+ break;
+ }
+
updatePollingRate(isIdle.Value);
createButton.FadeTo(newScreen is LoungeSubScreen ? 1 : 0, 200);
@@ -327,5 +365,36 @@ namespace osu.Game.Screens.Multi
FourthWaveColour = OsuColour.FromHex(@"392850");
}
}
+
+ private class HeaderBackgroundSprite : MultiplayerBackgroundSprite
+ {
+ protected override UpdateableBeatmapBackgroundSprite CreateBackgroundSprite() => new BackgroundSprite { RelativeSizeAxes = Axes.Both };
+
+ private class BackgroundSprite : UpdateableBeatmapBackgroundSprite
+ {
+ protected override double TransformDuration => 200;
+ }
+ }
+
+ public class CreateRoomButton : PurpleTriangleButton
+ {
+ public CreateRoomButton()
+ {
+ Size = new Vector2(150, Header.HEIGHT - 20);
+ Margin = new MarginPadding
+ {
+ Top = 10,
+ Right = 10 + HORIZONTAL_OVERFLOW_PADDING,
+ };
+ }
+
+ [BackgroundDependencyLoader]
+ private void load()
+ {
+ Triangles.TriangleScale = 1.5f;
+
+ Text = "Create room";
+ }
+ }
}
}
diff --git a/osu.Game/Screens/Multi/MultiplayerSubScreen.cs b/osu.Game/Screens/Multi/MultiplayerSubScreen.cs
index ff94f63f01..8e46de1a95 100644
--- a/osu.Game/Screens/Multi/MultiplayerSubScreen.cs
+++ b/osu.Game/Screens/Multi/MultiplayerSubScreen.cs
@@ -4,7 +4,6 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Screens;
-using osu.Game.Graphics.Containers;
namespace osu.Game.Screens.Multi
{
@@ -24,31 +23,41 @@ namespace osu.Game.Screens.Multi
RelativeSizeAxes = Axes.Both;
}
+ public const float X_SHIFT = 200;
+
+ public const double X_MOVE_DURATION = 800;
+
+ public const double RESUME_TRANSITION_DELAY = DISAPPEAR_DURATION / 2;
+
+ public const double APPEAR_DURATION = 800;
+
+ public const double DISAPPEAR_DURATION = 500;
+
public override void OnEntering(IScreen last)
{
- this.FadeInFromZero(WaveContainer.APPEAR_DURATION, Easing.OutQuint);
- this.FadeInFromZero(WaveContainer.APPEAR_DURATION, Easing.OutQuint);
- this.MoveToX(200).MoveToX(0, WaveContainer.APPEAR_DURATION, Easing.OutQuint);
+ this.FadeInFromZero(APPEAR_DURATION, Easing.OutQuint);
+ this.FadeInFromZero(APPEAR_DURATION, Easing.OutQuint);
+ this.MoveToX(X_SHIFT).MoveToX(0, X_MOVE_DURATION, Easing.OutQuint);
}
public override bool OnExiting(IScreen next)
{
- this.FadeOut(WaveContainer.DISAPPEAR_DURATION, Easing.OutQuint);
- this.MoveToX(200, WaveContainer.DISAPPEAR_DURATION, Easing.OutQuint);
+ this.FadeOut(DISAPPEAR_DURATION, Easing.OutQuint);
+ this.MoveToX(X_SHIFT, X_MOVE_DURATION, Easing.OutQuint);
return false;
}
public override void OnResuming(IScreen last)
{
- this.FadeIn(WaveContainer.APPEAR_DURATION, Easing.OutQuint);
- this.MoveToX(0, WaveContainer.APPEAR_DURATION, Easing.OutQuint);
+ this.Delay(RESUME_TRANSITION_DELAY).FadeIn(APPEAR_DURATION, Easing.OutQuint);
+ this.MoveToX(0, X_MOVE_DURATION, Easing.OutQuint);
}
public override void OnSuspending(IScreen next)
{
- this.FadeOut(WaveContainer.DISAPPEAR_DURATION, Easing.OutQuint);
- this.MoveToX(-200, WaveContainer.DISAPPEAR_DURATION, Easing.OutQuint);
+ this.FadeOut(DISAPPEAR_DURATION, Easing.OutQuint);
+ this.MoveToX(-X_SHIFT, X_MOVE_DURATION, Easing.OutQuint);
}
public override string ToString() => Title;
diff --git a/osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs b/osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs
index ff5471cf4a..f8fb192b5c 100644
--- a/osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs
+++ b/osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs
@@ -23,7 +23,9 @@ namespace osu.Game.Screens.Multi.Ranking.Pages
{
public class RoomLeaderboardPage : ResultsPage
{
- private OsuColour colours;
+ [Resolved]
+ private OsuColour colours { get; set; }
+
private TextFlowContainer rankText;
[Resolved(typeof(Room), nameof(Room.Name))]
@@ -35,10 +37,8 @@ namespace osu.Game.Screens.Multi.Ranking.Pages
}
[BackgroundDependencyLoader]
- private void load(OsuColour colours)
+ private void load()
{
- this.colours = colours;
-
MatchLeaderboard leaderboard;
Children = new Drawable[]
diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
new file mode 100644
index 0000000000..074341226e
--- /dev/null
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -0,0 +1,180 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. 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.Graphics.Sprites;
+using osu.Framework.Localisation;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Play
+{
+ /// <summary>
+ /// Displays beatmap metadata inside <see cref="PlayerLoader"/>
+ /// </summary>
+ public class BeatmapMetadataDisplay : Container
+ {
+ private class MetadataLine : Container
+ {
+ public MetadataLine(string left, string right)
+ {
+ AutoSizeAxes = Axes.Both;
+ Children = new Drawable[]
+ {
+ new OsuSpriteText
+ {
+ Anchor = Anchor.TopCentre,
+ Origin = Anchor.TopRight,
+ Margin = new MarginPadding { Right = 5 },
+ Colour = OsuColour.Gray(0.8f),
+ Text = left,
+ },
+ new OsuSpriteText
+ {
+ Anchor = Anchor.TopCentre,
+ Origin = Anchor.TopLeft,
+ Margin = new MarginPadding { Left = 5 },
+ Text = string.IsNullOrEmpty(right) ? @"-" : right,
+ }
+ };
+ }
+ }
+
+ private readonly WorkingBeatmap beatmap;
+ private readonly Bindable<IReadOnlyList<Mod>> mods;
+ private readonly Drawable facade;
+ private LoadingAnimation loading;
+ private Sprite backgroundSprite;
+
+ public IBindable<IReadOnlyList<Mod>> Mods => mods;
+
+ public bool Loading
+ {
+ set
+ {
+ if (value)
+ {
+ loading.Show();
+ backgroundSprite.FadeColour(OsuColour.Gray(0.5f), 400, Easing.OutQuint);
+ }
+ else
+ {
+ loading.Hide();
+ backgroundSprite.FadeColour(Color4.White, 400, Easing.OutQuint);
+ }
+ }
+ }
+
+ public BeatmapMetadataDisplay(WorkingBeatmap beatmap, Bindable<IReadOnlyList<Mod>> mods, Drawable facade)
+ {
+ this.beatmap = beatmap;
+ this.facade = facade;
+
+ this.mods = new Bindable<IReadOnlyList<Mod>>();
+ this.mods.BindTo(mods);
+ }
+
+ [BackgroundDependencyLoader]
+ private void load()
+ {
+ var metadata = beatmap.BeatmapInfo?.Metadata ?? new BeatmapMetadata();
+
+ AutoSizeAxes = Axes.Both;
+ Children = new Drawable[]
+ {
+ new FillFlowContainer
+ {
+ AutoSizeAxes = Axes.Both,
+ Origin = Anchor.TopCentre,
+ Anchor = Anchor.TopCentre,
+ Direction = FillDirection.Vertical,
+ Children = new[]
+ {
+ facade.With(d =>
+ {
+ d.Anchor = Anchor.TopCentre;
+ d.Origin = Anchor.TopCentre;
+ }),
+ new OsuSpriteText
+ {
+ Text = new LocalisedString((metadata.TitleUnicode, metadata.Title)),
+ Font = OsuFont.GetFont(size: 36, italics: true),
+ Origin = Anchor.TopCentre,
+ Anchor = Anchor.TopCentre,
+ Margin = new MarginPadding { Top = 15 },
+ },
+ new OsuSpriteText
+ {
+ Text = new LocalisedString((metadata.ArtistUnicode, metadata.Artist)),
+ Font = OsuFont.GetFont(size: 26, italics: true),
+ Origin = Anchor.TopCentre,
+ Anchor = Anchor.TopCentre,
+ },
+ new Container
+ {
+ Size = new Vector2(300, 60),
+ Margin = new MarginPadding(10),
+ Origin = Anchor.TopCentre,
+ Anchor = Anchor.TopCentre,
+ CornerRadius = 10,
+ Masking = true,
+ Children = new Drawable[]
+ {
+ backgroundSprite = new Sprite
+ {
+ RelativeSizeAxes = Axes.Both,
+ Texture = beatmap?.Background,
+ Origin = Anchor.Centre,
+ Anchor = Anchor.Centre,
+ FillMode = FillMode.Fill,
+ },
+ loading = new LoadingAnimation { Scale = new Vector2(1.3f) }
+ }
+ },
+ new OsuSpriteText
+ {
+ Text = beatmap?.BeatmapInfo?.Version,
+ Font = OsuFont.GetFont(size: 26, italics: true),
+ Origin = Anchor.TopCentre,
+ Anchor = Anchor.TopCentre,
+ Margin = new MarginPadding
+ {
+ Bottom = 40
+ },
+ },
+ new MetadataLine("Source", metadata.Source)
+ {
+ Origin = Anchor.TopCentre,
+ Anchor = Anchor.TopCentre,
+ },
+ new MetadataLine("Mapper", metadata.AuthorString)
+ {
+ Origin = Anchor.TopCentre,
+ Anchor = Anchor.TopCentre,
+ },
+ new ModDisplay
+ {
+ Anchor = Anchor.TopCentre,
+ Origin = Anchor.TopCentre,
+ AutoSizeAxes = Axes.Both,
+ Margin = new MarginPadding { Top = 20 },
+ Current = mods
+ }
+ },
+ }
+ };
+
+ Loading = true;
+ }
+ }
+}
diff --git a/osu.Game/Screens/Play/GameplayBeatmap.cs b/osu.Game/Screens/Play/GameplayBeatmap.cs
new file mode 100644
index 0000000000..d7f939a883
--- /dev/null
+++ b/osu.Game/Screens/Play/GameplayBeatmap.cs
@@ -0,0 +1,42 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Beatmaps.Timing;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Screens.Play
+{
+ public class GameplayBeatmap : Component, IBeatmap
+ {
+ public readonly IBeatmap PlayableBeatmap;
+
+ public GameplayBeatmap(IBeatmap playableBeatmap)
+ {
+ PlayableBeatmap = playableBeatmap;
+ }
+
+ public BeatmapInfo BeatmapInfo
+ {
+ get => PlayableBeatmap.BeatmapInfo;
+ set => PlayableBeatmap.BeatmapInfo = value;
+ }
+
+ public BeatmapMetadata Metadata => PlayableBeatmap.Metadata;
+
+ public ControlPointInfo ControlPointInfo => PlayableBeatmap.ControlPointInfo;
+
+ public List<BreakPeriod> Breaks => PlayableBeatmap.Breaks;
+
+ public double TotalBreakTime => PlayableBeatmap.TotalBreakTime;
+
+ public IReadOnlyList<HitObject> HitObjects => PlayableBeatmap.HitObjects;
+
+ public IEnumerable<BeatmapStatistic> GetStatistics() => PlayableBeatmap.GetStatistics();
+
+ public IBeatmap Clone() => PlayableBeatmap.Clone();
+ }
+}
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index aecd35f7dc..bd43b23a9f 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -65,7 +65,8 @@ namespace osu.Game.Screens.Play
private Ruleset ruleset;
- private IAPIProvider api;
+ [Resolved]
+ private IAPIProvider api { get; set; }
private SampleChannel sampleRestart;
@@ -110,11 +111,16 @@ namespace osu.Game.Screens.Play
this.showResults = showResults;
}
- [BackgroundDependencyLoader]
- private void load(AudioManager audio, IAPIProvider api, OsuConfigManager config)
- {
- this.api = api;
+ private GameplayBeatmap gameplayBeatmap;
+ private DependencyContainer dependencies;
+
+ protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+ => dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+
+ [BackgroundDependencyLoader]
+ private void load(AudioManager audio, OsuConfigManager config)
+ {
Mods.Value = base.Mods.Value.Select(m => m.CreateCopy()).ToArray();
if (Beatmap.Value is DummyWorkingBeatmap)
@@ -143,6 +149,10 @@ namespace osu.Game.Screens.Play
InternalChild = GameplayClockContainer = new GameplayClockContainer(Beatmap.Value, Mods.Value, DrawableRuleset.GameplayStartTime);
+ AddInternal(gameplayBeatmap = new GameplayBeatmap(playableBeatmap));
+
+ dependencies.CacheAs(gameplayBeatmap);
+
addUnderlayComponents(GameplayClockContainer);
addGameplayComponents(GameplayClockContainer, Beatmap.Value);
addOverlayComponents(GameplayClockContainer, Beatmap.Value);
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index f37faac988..c0d88feda2 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -2,7 +2,6 @@
// See the LICENCE file in the repository root for full licence text.
using System;
-using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using osu.Framework.Allocation;
@@ -12,21 +11,15 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input;
-using osu.Framework.Localisation;
using osu.Framework.Screens;
using osu.Framework.Threading;
-using osu.Game.Beatmaps;
using osu.Game.Configuration;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
using osu.Game.Input;
using osu.Game.Overlays;
using osu.Game.Overlays.Notifications;
-using osu.Game.Rulesets.Mods;
using osu.Game.Screens.Menu;
-using osu.Game.Screens.Play.HUD;
using osu.Game.Screens.Play.PlayerSettings;
using osu.Game.Users;
using osuTK;
@@ -38,30 +31,65 @@ namespace osu.Game.Screens.Play
{
protected const float BACKGROUND_BLUR = 15;
+ public override bool HideOverlaysOnEnter => hideOverlays;
+
+ public override bool DisallowExternalBeatmapRulesetChanges => true;
+
+ // Here because IsHovered will not update unless we do so.
+ public override bool HandlePositionalInput => true;
+
+ // We show the previous screen status
+ protected override UserActivity InitialActivity => null;
+
+ protected override bool PlayResumeSound => false;
+
+ protected BeatmapMetadataDisplay MetadataInfo;
+
+ protected VisualSettings VisualSettings;
+
+ protected Task LoadTask { get; private set; }
+
+ protected Task DisposalTask { get; private set; }
+
+ private bool backgroundBrightnessReduction;
+
+ protected bool BackgroundBrightnessReduction
+ {
+ set
+ {
+ if (value == backgroundBrightnessReduction)
+ return;
+
+ backgroundBrightnessReduction = value;
+
+ Background.FadeColour(OsuColour.Gray(backgroundBrightnessReduction ? 0.8f : 1), 200);
+ }
+ }
+
+ private bool readyForPush =>
+ // don't push unless the player is completely loaded
+ player.LoadState == LoadState.Ready
+ // don't push if the user is hovering one of the panes, unless they are idle.
+ && (IsHovered || idleTracker.IsIdle.Value)
+ // don't push if the user is dragging a slider or otherwise.
+ && inputManager?.DraggedDrawable == null
+ // don't push if a focused overlay is visible, like settings.
+ && inputManager?.FocusedDrawable == null;
+
private readonly Func<Player> createPlayer;
private Player player;
private LogoTrackingContainer content;
- protected BeatmapMetadataDisplay MetadataInfo;
-
private bool hideOverlays;
- public override bool HideOverlaysOnEnter => hideOverlays;
-
- protected override UserActivity InitialActivity => null; //shows the previous screen status
-
- public override bool DisallowExternalBeatmapRulesetChanges => true;
-
- protected override bool PlayResumeSound => false;
-
- protected Task LoadTask { get; private set; }
-
- protected Task DisposalTask { get; private set; }
private InputManager inputManager;
+
private IdleTracker idleTracker;
+ private ScheduledDelegate scheduledPushPlayer;
+
[Resolved(CanBeNull = true)]
private NotificationOverlay notificationOverlay { get; set; }
@@ -71,19 +99,11 @@ namespace osu.Game.Screens.Play
[Resolved]
private AudioManager audioManager { get; set; }
- private Bindable<bool> muteWarningShownOnce;
-
public PlayerLoader(Func<Player> createPlayer)
{
this.createPlayer = createPlayer;
}
- private void restartRequested()
- {
- hideOverlays = true;
- ValidForResume = true;
- }
-
[BackgroundDependencyLoader]
private void load(SessionStatics sessionStatics)
{
@@ -127,11 +147,13 @@ namespace osu.Game.Screens.Play
inputManager = GetContainingInputManager();
}
+ #region Screen handling
+
public override void OnEntering(IScreen last)
{
base.OnEntering(last);
- loadNewPlayer();
+ prepareNewPlayer();
content.ScaleTo(0.7f);
Background?.FadeColour(Color4.White, 800, Easing.OutQuint);
@@ -141,15 +163,7 @@ namespace osu.Game.Screens.Play
MetadataInfo.Delay(750).FadeIn(500);
this.Delay(1800).Schedule(pushWhenLoaded);
- if (!muteWarningShownOnce.Value)
- {
- //Checks if the notification has not been shown yet and also if master volume is muted, track/music volume is muted or if the whole game is muted.
- if (volumeOverlay?.IsMuted.Value == true || audioManager.Volume.Value <= audioManager.Volume.MinValue || audioManager.VolumeTrack.Value <= audioManager.VolumeTrack.MinValue)
- {
- notificationOverlay?.Post(new MutedNotification());
- muteWarningShownOnce.Value = true;
- }
- }
+ showMuteWarningIfNeeded();
}
public override void OnResuming(IScreen last)
@@ -160,36 +174,32 @@ namespace osu.Game.Screens.Play
MetadataInfo.Loading = true;
- //we will only be resumed if the player has requested a re-run (see ValidForResume setting above)
- loadNewPlayer();
+ // we will only be resumed if the player has requested a re-run (see restartRequested).
+ prepareNewPlayer();
this.Delay(400).Schedule(pushWhenLoaded);
}
- private void loadNewPlayer()
+ public override void OnSuspending(IScreen next)
{
- var restartCount = player?.RestartCount + 1 ?? 0;
+ base.OnSuspending(next);
- player = createPlayer();
- player.RestartCount = restartCount;
- player.RestartRequested = restartRequested;
+ cancelLoad();
- LoadTask = LoadComponentAsync(player, _ => MetadataInfo.Loading = false);
+ BackgroundBrightnessReduction = false;
}
- private void contentIn()
+ public override bool OnExiting(IScreen next)
{
- content.ScaleTo(1, 650, Easing.OutQuint);
- content.FadeInFromZero(400);
- }
+ cancelLoad();
- private void contentOut()
- {
- // Ensure the logo is no longer tracking before we scale the content
- content.StopTracking();
+ content.ScaleTo(0.7f, 150, Easing.InQuint);
+ this.FadeOut(150);
- content.ScaleTo(0.7f, 300, Easing.InQuint);
- content.FadeOut(250);
+ Background.EnableUserDim.Value = false;
+ BackgroundBrightnessReduction = false;
+
+ return base.OnExiting(next);
}
protected override void LogoArriving(OsuLogo logo, bool resuming)
@@ -198,10 +208,7 @@ namespace osu.Game.Screens.Play
const double duration = 300;
- if (!resuming)
- {
- logo.MoveTo(new Vector2(0.5f), duration, Easing.In);
- }
+ if (!resuming) logo.MoveTo(new Vector2(0.5f), duration, Easing.In);
logo.ScaleTo(new Vector2(0.15f), duration, Easing.In);
logo.FadeIn(350);
@@ -219,109 +226,7 @@ namespace osu.Game.Screens.Play
content.StopTracking();
}
- private ScheduledDelegate pushDebounce;
- protected VisualSettings VisualSettings;
-
- // Here because IsHovered will not update unless we do so.
- public override bool HandlePositionalInput => true;
-
- private bool readyForPush => player.LoadState == LoadState.Ready && (IsHovered || idleTracker.IsIdle.Value) && inputManager?.DraggedDrawable == null;
-
- private void pushWhenLoaded()
- {
- if (!this.IsCurrentScreen()) return;
-
- try
- {
- if (!readyForPush)
- {
- // as the pushDebounce below has a delay, we need to keep checking and cancel a future debounce
- // if we become unready for push during the delay.
- cancelLoad();
- return;
- }
-
- if (pushDebounce != null)
- return;
-
- pushDebounce = Scheduler.AddDelayed(() =>
- {
- contentOut();
-
- this.Delay(250).Schedule(() =>
- {
- if (!this.IsCurrentScreen()) return;
-
- LoadTask = null;
-
- //By default, we want to load the player and never be returned to.
- //Note that this may change if the player we load requested a re-run.
- ValidForResume = false;
-
- if (player.LoadedBeatmapSuccessfully)
- this.Push(player);
- else
- this.Exit();
- });
- }, 500);
- }
- finally
- {
- Schedule(pushWhenLoaded);
- }
- }
-
- private void cancelLoad()
- {
- pushDebounce?.Cancel();
- pushDebounce = null;
- }
-
- public override void OnSuspending(IScreen next)
- {
- BackgroundBrightnessReduction = false;
- base.OnSuspending(next);
- cancelLoad();
- }
-
- public override bool OnExiting(IScreen next)
- {
- content.ScaleTo(0.7f, 150, Easing.InQuint);
- this.FadeOut(150);
- cancelLoad();
-
- Background.EnableUserDim.Value = false;
- BackgroundBrightnessReduction = false;
-
- return base.OnExiting(next);
- }
-
- protected override void Dispose(bool isDisposing)
- {
- base.Dispose(isDisposing);
-
- if (isDisposing)
- {
- // if the player never got pushed, we should explicitly dispose it.
- DisposalTask = LoadTask?.ContinueWith(_ => player.Dispose());
- }
- }
-
- private bool backgroundBrightnessReduction;
-
- protected bool BackgroundBrightnessReduction
- {
- get => backgroundBrightnessReduction;
- set
- {
- if (value == backgroundBrightnessReduction)
- return;
-
- backgroundBrightnessReduction = value;
-
- Background.FadeColour(OsuColour.Gray(backgroundBrightnessReduction ? 0.8f : 1), 200);
- }
- }
+ #endregion
protected override void Update()
{
@@ -350,171 +255,129 @@ namespace osu.Game.Screens.Play
}
}
- protected class BeatmapMetadataDisplay : Container
+ private void prepareNewPlayer()
{
- private class MetadataLine : Container
+ var restartCount = player?.RestartCount + 1 ?? 0;
+
+ player = createPlayer();
+ player.RestartCount = restartCount;
+ player.RestartRequested = restartRequested;
+
+ LoadTask = LoadComponentAsync(player, _ => MetadataInfo.Loading = false);
+ }
+
+ private void restartRequested()
+ {
+ hideOverlays = true;
+ ValidForResume = true;
+ }
+
+ private void contentIn()
+ {
+ content.ScaleTo(1, 650, Easing.OutQuint);
+ content.FadeInFromZero(400);
+ }
+
+ private void contentOut()
+ {
+ // Ensure the logo is no longer tracking before we scale the content
+ content.StopTracking();
+
+ content.ScaleTo(0.7f, 300, Easing.InQuint);
+ content.FadeOut(250);
+ }
+
+ private void pushWhenLoaded()
+ {
+ if (!this.IsCurrentScreen()) return;
+
+ try
{
- public MetadataLine(string left, string right)
+ if (!readyForPush)
{
- AutoSizeAxes = Axes.Both;
- Children = new Drawable[]
- {
- new OsuSpriteText
- {
- Anchor = Anchor.TopCentre,
- Origin = Anchor.TopRight,
- Margin = new MarginPadding { Right = 5 },
- Colour = OsuColour.Gray(0.8f),
- Text = left,
- },
- new OsuSpriteText
- {
- Anchor = Anchor.TopCentre,
- Origin = Anchor.TopLeft,
- Margin = new MarginPadding { Left = 5 },
- Text = string.IsNullOrEmpty(right) ? @"-" : right,
- }
- };
+ // as the pushDebounce below has a delay, we need to keep checking and cancel a future debounce
+ // if we become unready for push during the delay.
+ cancelLoad();
+ return;
}
- }
- private readonly WorkingBeatmap beatmap;
- private readonly Bindable<IReadOnlyList<Mod>> mods;
- private readonly Drawable facade;
- private LoadingAnimation loading;
- private Sprite backgroundSprite;
+ if (scheduledPushPlayer != null)
+ return;
- public IBindable<IReadOnlyList<Mod>> Mods => mods;
-
- public bool Loading
- {
- set
+ scheduledPushPlayer = Scheduler.AddDelayed(() =>
{
- if (value)
+ contentOut();
+
+ this.Delay(250).Schedule(() =>
{
- loading.Show();
- backgroundSprite.FadeColour(OsuColour.Gray(0.5f), 400, Easing.OutQuint);
- }
- else
- {
- loading.Hide();
- backgroundSprite.FadeColour(Color4.White, 400, Easing.OutQuint);
- }
+ if (!this.IsCurrentScreen()) return;
+
+ LoadTask = null;
+
+ //By default, we want to load the player and never be returned to.
+ //Note that this may change if the player we load requested a re-run.
+ ValidForResume = false;
+
+ if (player.LoadedBeatmapSuccessfully)
+ this.Push(player);
+ else
+ this.Exit();
+ });
+ }, 500);
+ }
+ finally
+ {
+ Schedule(pushWhenLoaded);
+ }
+ }
+
+ private void cancelLoad()
+ {
+ scheduledPushPlayer?.Cancel();
+ scheduledPushPlayer = null;
+ }
+
+ #region Disposal
+
+ protected override void Dispose(bool isDisposing)
+ {
+ base.Dispose(isDisposing);
+
+ if (isDisposing)
+ {
+ // if the player never got pushed, we should explicitly dispose it.
+ DisposalTask = LoadTask?.ContinueWith(_ => player.Dispose());
+ }
+ }
+
+ #endregion
+
+ #region Mute warning
+
+ private Bindable<bool> muteWarningShownOnce;
+
+ private void showMuteWarningIfNeeded()
+ {
+ if (!muteWarningShownOnce.Value)
+ {
+ //Checks if the notification has not been shown yet and also if master volume is muted, track/music volume is muted or if the whole game is muted.
+ if (volumeOverlay?.IsMuted.Value == true || audioManager.Volume.Value <= audioManager.Volume.MinValue || audioManager.VolumeTrack.Value <= audioManager.VolumeTrack.MinValue)
+ {
+ notificationOverlay?.Post(new MutedNotification());
+ muteWarningShownOnce.Value = true;
}
}
-
- public BeatmapMetadataDisplay(WorkingBeatmap beatmap, Bindable<IReadOnlyList<Mod>> mods, Drawable facade)
- {
- this.beatmap = beatmap;
- this.facade = facade;
-
- this.mods = new Bindable<IReadOnlyList<Mod>>();
- this.mods.BindTo(mods);
- }
-
- [BackgroundDependencyLoader]
- private void load()
- {
- var metadata = beatmap.BeatmapInfo?.Metadata ?? new BeatmapMetadata();
-
- AutoSizeAxes = Axes.Both;
- Children = new Drawable[]
- {
- new FillFlowContainer
- {
- AutoSizeAxes = Axes.Both,
- Origin = Anchor.TopCentre,
- Anchor = Anchor.TopCentre,
- Direction = FillDirection.Vertical,
- Children = new[]
- {
- facade.With(d =>
- {
- d.Anchor = Anchor.TopCentre;
- d.Origin = Anchor.TopCentre;
- }),
- new OsuSpriteText
- {
- Text = new LocalisedString((metadata.TitleUnicode, metadata.Title)),
- Font = OsuFont.GetFont(size: 36, italics: true),
- Origin = Anchor.TopCentre,
- Anchor = Anchor.TopCentre,
- Margin = new MarginPadding { Top = 15 },
- },
- new OsuSpriteText
- {
- Text = new LocalisedString((metadata.ArtistUnicode, metadata.Artist)),
- Font = OsuFont.GetFont(size: 26, italics: true),
- Origin = Anchor.TopCentre,
- Anchor = Anchor.TopCentre,
- },
- new Container
- {
- Size = new Vector2(300, 60),
- Margin = new MarginPadding(10),
- Origin = Anchor.TopCentre,
- Anchor = Anchor.TopCentre,
- CornerRadius = 10,
- Masking = true,
- Children = new Drawable[]
- {
- backgroundSprite = new Sprite
- {
- RelativeSizeAxes = Axes.Both,
- Texture = beatmap?.Background,
- Origin = Anchor.Centre,
- Anchor = Anchor.Centre,
- FillMode = FillMode.Fill,
- },
- loading = new LoadingAnimation { Scale = new Vector2(1.3f) }
- }
- },
- new OsuSpriteText
- {
- Text = beatmap?.BeatmapInfo?.Version,
- Font = OsuFont.GetFont(size: 26, italics: true),
- Origin = Anchor.TopCentre,
- Anchor = Anchor.TopCentre,
- Margin = new MarginPadding
- {
- Bottom = 40
- },
- },
- new MetadataLine("Source", metadata.Source)
- {
- Origin = Anchor.TopCentre,
- Anchor = Anchor.TopCentre,
- },
- new MetadataLine("Mapper", metadata.AuthorString)
- {
- Origin = Anchor.TopCentre,
- Anchor = Anchor.TopCentre,
- },
- new ModDisplay
- {
- Anchor = Anchor.TopCentre,
- Origin = Anchor.TopCentre,
- AutoSizeAxes = Axes.Both,
- Margin = new MarginPadding { Top = 20 },
- Current = mods
- }
- },
- }
- };
-
- Loading = true;
- }
}
private class MutedNotification : SimpleNotification
{
+ public override bool IsImportant => true;
+
public MutedNotification()
{
Text = "Your music volume is set to 0%! Click here to restore it.";
}
- public override bool IsImportant => true;
-
[BackgroundDependencyLoader]
private void load(OsuColour colours, AudioManager audioManager, NotificationOverlay notificationOverlay, VolumeOverlay volumeOverlay)
{
@@ -533,5 +396,7 @@ namespace osu.Game.Screens.Play
};
}
}
+
+ #endregion
}
}
diff --git a/osu.Game/Screens/Select/BeatmapDetailArea.cs b/osu.Game/Screens/Select/BeatmapDetailArea.cs
index 71733c9f06..2e78b1aed2 100644
--- a/osu.Game/Screens/Select/BeatmapDetailArea.cs
+++ b/osu.Game/Screens/Select/BeatmapDetailArea.cs
@@ -2,37 +2,40 @@
// See the LICENCE file in the repository root for full licence text.
using System;
+using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Beatmaps;
-using osu.Game.Screens.Select.Leaderboards;
namespace osu.Game.Screens.Select
{
- public class BeatmapDetailArea : Container
+ public abstract class BeatmapDetailArea : Container
{
private const float details_padding = 10;
- private readonly Container content;
- protected override Container<Drawable> Content => content;
-
- public readonly BeatmapDetails Details;
- public readonly BeatmapLeaderboard Leaderboard;
-
private WorkingBeatmap beatmap;
- public WorkingBeatmap Beatmap
+ public virtual WorkingBeatmap Beatmap
{
get => beatmap;
set
{
beatmap = value;
- Details.Beatmap = beatmap?.BeatmapInfo;
- Leaderboard.Beatmap = beatmap is DummyWorkingBeatmap ? null : beatmap?.BeatmapInfo;
+
+ Details.Beatmap = value?.BeatmapInfo;
}
}
- public BeatmapDetailArea()
+ public readonly BeatmapDetails Details;
+
+ protected Bindable<BeatmapDetailAreaTabItem> CurrentTab => tabControl.Current;
+
+ private readonly Container content;
+ protected override Container<Drawable> Content => content;
+
+ private readonly BeatmapDetailAreaTabControl tabControl;
+
+ protected BeatmapDetailArea()
{
AddRangeInternal(new Drawable[]
{
@@ -40,51 +43,62 @@ namespace osu.Game.Screens.Select
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Top = BeatmapDetailAreaTabControl.HEIGHT },
- },
- new BeatmapDetailAreaTabControl
- {
- RelativeSizeAxes = Axes.X,
- OnFilter = (tab, mods) =>
+ Child = Details = new BeatmapDetails
{
- Leaderboard.FilterMods = mods;
-
- switch (tab)
- {
- case BeatmapDetailTab.Details:
- Details.Show();
- Leaderboard.Hide();
- break;
-
- default:
- Details.Hide();
- Leaderboard.Scope = (BeatmapLeaderboardScope)tab - 1;
- Leaderboard.Show();
- break;
- }
- },
+ RelativeSizeAxes = Axes.X,
+ Alpha = 0,
+ Margin = new MarginPadding { Top = details_padding },
+ }
},
- });
-
- AddRange(new Drawable[]
- {
- Details = new BeatmapDetails
+ tabControl = new BeatmapDetailAreaTabControl
{
RelativeSizeAxes = Axes.X,
- Alpha = 0,
- Margin = new MarginPadding { Top = details_padding },
+ TabItems = CreateTabItems(),
+ OnFilter = OnTabChanged,
},
- Leaderboard = new BeatmapLeaderboard
- {
- RelativeSizeAxes = Axes.Both,
- }
});
}
+ /// <summary>
+ /// Refreshes the currently-displayed details.
+ /// </summary>
+ public virtual void Refresh()
+ {
+ }
+
protected override void UpdateAfterChildren()
{
base.UpdateAfterChildren();
Details.Height = Math.Min(DrawHeight - details_padding * 3 - BeatmapDetailAreaTabControl.HEIGHT, 450);
}
+
+ /// <summary>
+ /// Invoked when a new tab is selected.
+ /// </summary>
+ /// <param name="tab">The tab that was selected.</param>
+ /// <param name="selectedMods">Whether the currently-selected mods should be considered.</param>
+ protected virtual void OnTabChanged(BeatmapDetailAreaTabItem tab, bool selectedMods)
+ {
+ switch (tab)
+ {
+ case BeatmapDetailAreaDetailTabItem _:
+ Details.Show();
+ break;
+
+ default:
+ Details.Hide();
+ break;
+ }
+ }
+
+ /// <summary>
+ /// Creates the tabs to be displayed.
+ /// </summary>
+ /// <returns>The tabs.</returns>
+ protected virtual BeatmapDetailAreaTabItem[] CreateTabItems() => new BeatmapDetailAreaTabItem[]
+ {
+ new BeatmapDetailAreaDetailTabItem(),
+ };
}
}
diff --git a/osu.Game/Screens/Select/BeatmapDetailAreaDetailTabItem.cs b/osu.Game/Screens/Select/BeatmapDetailAreaDetailTabItem.cs
new file mode 100644
index 0000000000..7376cb4708
--- /dev/null
+++ b/osu.Game/Screens/Select/BeatmapDetailAreaDetailTabItem.cs
@@ -0,0 +1,10 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Screens.Select
+{
+ public class BeatmapDetailAreaDetailTabItem : BeatmapDetailAreaTabItem
+ {
+ public override string Name => "Details";
+ }
+}
diff --git a/osu.Game/Screens/Select/BeatmapDetailAreaLeaderboardTabItem.cs b/osu.Game/Screens/Select/BeatmapDetailAreaLeaderboardTabItem.cs
new file mode 100644
index 0000000000..066944e9d2
--- /dev/null
+++ b/osu.Game/Screens/Select/BeatmapDetailAreaLeaderboardTabItem.cs
@@ -0,0 +1,22 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+
+namespace osu.Game.Screens.Select
+{
+ public class BeatmapDetailAreaLeaderboardTabItem<TScope> : BeatmapDetailAreaTabItem
+ where TScope : Enum
+ {
+ public override string Name => Scope.ToString();
+
+ public override bool FilterableByMods => true;
+
+ public readonly TScope Scope;
+
+ public BeatmapDetailAreaLeaderboardTabItem(TScope scope)
+ {
+ Scope = scope;
+ }
+ }
+}
diff --git a/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs b/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
index 19ecdb6dbf..f4bf1ab059 100644
--- a/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
+++ b/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
@@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using System;
+using System.Collections.Generic;
using osuTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
@@ -18,14 +19,25 @@ namespace osu.Game.Screens.Select
public class BeatmapDetailAreaTabControl : Container
{
public const float HEIGHT = 24;
+
+ public Bindable<BeatmapDetailAreaTabItem> Current
+ {
+ get => tabs.Current;
+ set => tabs.Current = value;
+ }
+
+ public Action<BeatmapDetailAreaTabItem, bool> OnFilter; //passed the selected tab and if mods is checked
+
+ public IReadOnlyList<BeatmapDetailAreaTabItem> TabItems
+ {
+ get => tabs.Items;
+ set => tabs.Items = value;
+ }
+
private readonly OsuTabControlCheckbox modsCheckbox;
- private readonly OsuTabControl<BeatmapDetailTab> tabs;
+ private readonly OsuTabControl<BeatmapDetailAreaTabItem> tabs;
private readonly Container tabsContainer;
- public Action<BeatmapDetailTab, bool> OnFilter; //passed the selected tab and if mods is checked
-
- private Bindable<BeatmapDetailTab> selectedTab;
-
public BeatmapDetailAreaTabControl()
{
Height = HEIGHT;
@@ -43,7 +55,7 @@ namespace osu.Game.Screens.Select
tabsContainer = new Container
{
RelativeSizeAxes = Axes.Both,
- Child = tabs = new OsuTabControl<BeatmapDetailTab>
+ Child = tabs = new OsuTabControl<BeatmapDetailAreaTabItem>
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
@@ -68,29 +80,22 @@ namespace osu.Game.Screens.Select
private void load(OsuColour colour, OsuConfigManager config)
{
modsCheckbox.AccentColour = tabs.AccentColour = colour.YellowLight;
-
- selectedTab = config.GetBindable<BeatmapDetailTab>(OsuSetting.BeatmapDetailTab);
-
- tabs.Current.BindTo(selectedTab);
- tabs.Current.TriggerChange();
}
private void invokeOnFilter()
{
OnFilter?.Invoke(tabs.Current.Value, modsCheckbox.Current.Value);
- modsCheckbox.FadeTo(tabs.Current.Value == BeatmapDetailTab.Details ? 0 : 1, 200, Easing.OutQuint);
-
- tabsContainer.Padding = new MarginPadding { Right = tabs.Current.Value == BeatmapDetailTab.Details ? 0 : 100 };
+ if (tabs.Current.Value.FilterableByMods)
+ {
+ modsCheckbox.FadeTo(1, 200, Easing.OutQuint);
+ tabsContainer.Padding = new MarginPadding { Right = 100 };
+ }
+ else
+ {
+ modsCheckbox.FadeTo(0, 200, Easing.OutQuint);
+ tabsContainer.Padding = new MarginPadding();
+ }
}
}
-
- public enum BeatmapDetailTab
- {
- Details,
- Local,
- Country,
- Global,
- Friends
- }
}
diff --git a/osu.Game/Screens/Select/BeatmapDetailAreaTabItem.cs b/osu.Game/Screens/Select/BeatmapDetailAreaTabItem.cs
new file mode 100644
index 0000000000..f28e5a7c22
--- /dev/null
+++ b/osu.Game/Screens/Select/BeatmapDetailAreaTabItem.cs
@@ -0,0 +1,35 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+
+namespace osu.Game.Screens.Select
+{
+ public abstract class BeatmapDetailAreaTabItem : IEquatable<BeatmapDetailAreaTabItem>
+ {
+ /// <summary>
+ /// The name of this tab, to be displayed in the tab control.
+ /// </summary>
+ public abstract string Name { get; }
+
+ /// <summary>
+ /// Whether the contents of this tab can be filtered by the user's currently-selected mods.
+ /// </summary>
+ public virtual bool FilterableByMods => false;
+
+ public override string ToString() => Name;
+
+ public bool Equals(BeatmapDetailAreaTabItem other)
+ {
+ if (ReferenceEquals(null, other)) return false;
+ if (ReferenceEquals(this, other)) return true;
+
+ return Name == other.Name;
+ }
+
+ public override int GetHashCode()
+ {
+ return Name != null ? Name.GetHashCode() : 0;
+ }
+ }
+}
diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 577d999388..85b892336a 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -37,7 +37,8 @@ namespace osu.Game.Screens.Select
private readonly FailRetryGraph failRetryGraph;
private readonly DimmedLoadingLayer loading;
- private IAPIProvider api;
+ [Resolved]
+ private IAPIProvider api { get; set; }
private ScheduledDelegate pendingBeatmapSwitch;
@@ -160,12 +161,6 @@ namespace osu.Game.Screens.Select
};
}
- [BackgroundDependencyLoader]
- private void load(IAPIProvider api)
- {
- this.api = api;
- }
-
protected override void UpdateAfterChildren()
{
base.UpdateAfterChildren();
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index fba7a328c1..d9eeec9f85 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -37,7 +37,8 @@ namespace osu.Game.Screens.Select.Carousel
private Triangles triangles;
private StarCounter starCounter;
- private BeatmapSetOverlay beatmapOverlay;
+ [Resolved(CanBeNull = true)]
+ private BeatmapSetOverlay beatmapOverlay { get; set; }
public DrawableCarouselBeatmap(CarouselBeatmap panel)
: base(panel)
@@ -47,10 +48,8 @@ namespace osu.Game.Screens.Select.Carousel
}
[BackgroundDependencyLoader(true)]
- private void load(SongSelect songSelect, BeatmapManager manager, BeatmapSetOverlay beatmapOverlay)
+ private void load(SongSelect songSelect, BeatmapManager manager)
{
- this.beatmapOverlay = beatmapOverlay;
-
if (songSelect != null)
{
startRequested = b => songSelect.FinaliseSelection(b);
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 699e01bca7..997f2382fc 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -30,7 +30,9 @@ namespace osu.Game.Screens.Select.Carousel
private Action<BeatmapSetInfo> restoreHiddenRequested;
private Action<int> viewDetails;
- private DialogOverlay dialogOverlay;
+ [Resolved(CanBeNull = true)]
+ private DialogOverlay dialogOverlay { get; set; }
+
private readonly BeatmapSetInfo beatmapSet;
public DrawableCarouselBeatmapSet(CarouselBeatmapSet set)
@@ -40,10 +42,9 @@ namespace osu.Game.Screens.Select.Carousel
}
[BackgroundDependencyLoader(true)]
- private void load(BeatmapManager manager, BeatmapSetOverlay beatmapOverlay, DialogOverlay overlay)
+ private void load(BeatmapManager manager, BeatmapSetOverlay beatmapOverlay)
{
restoreHiddenRequested = s => s.Beatmaps.ForEach(manager.Restore);
- dialogOverlay = overlay;
if (beatmapOverlay != null)
viewDetails = beatmapOverlay.FetchAndShowBeatmapSet;
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 251456bf0d..2f3674642e 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -10,8 +10,8 @@ using osu.Framework.Graphics;
using osu.Framework.Screens;
using osu.Game.Beatmaps;
using osu.Game.Online.Multiplayer;
-using osu.Game.Rulesets.Mods;
using osu.Game.Screens.Multi;
+using osu.Game.Screens.Multi.Components;
namespace osu.Game.Screens.Select
{
@@ -35,40 +35,48 @@ namespace osu.Game.Screens.Select
Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
}
+ protected override BeatmapDetailArea CreateBeatmapDetailArea() => new MatchBeatmapDetailArea
+ {
+ CreateNewItem = createNewItem
+ };
+
protected override bool OnStart()
{
- var item = new PlaylistItem
+ switch (Playlist.Count)
{
- Beatmap = { Value = Beatmap.Value.BeatmapInfo },
- Ruleset = { Value = Ruleset.Value },
- RulesetID = Ruleset.Value.ID ?? 0
- };
+ case 0:
+ createNewItem();
+ break;
- item.RequiredMods.AddRange(Mods.Value);
+ case 1:
+ populateItemFromCurrent(Playlist.Single());
+ break;
+ }
- Selected?.Invoke(item);
-
- if (this.IsCurrentScreen())
- this.Exit();
+ this.Exit();
return true;
}
- public override bool OnExiting(IScreen next)
+ private void createNewItem()
{
- if (base.OnExiting(next))
- return true;
-
- var firstItem = Playlist.FirstOrDefault();
-
- if (firstItem != null)
+ PlaylistItem item = new PlaylistItem
{
- Ruleset.Value = firstItem.Ruleset.Value;
- Beatmap.Value = beatmaps.GetWorkingBeatmap(firstItem.Beatmap.Value);
- Mods.Value = firstItem.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
- }
+ ID = Playlist.Count == 0 ? 0 : Playlist.Max(p => p.ID) + 1
+ };
- return false;
+ populateItemFromCurrent(item);
+
+ Playlist.Add(item);
+ }
+
+ private void populateItemFromCurrent(PlaylistItem item)
+ {
+ item.Beatmap.Value = Beatmap.Value.BeatmapInfo;
+ item.Ruleset.Value = Ruleset.Value;
+
+ item.RequiredMods.Clear();
+ item.RequiredMods.AddRange(Mods.Value);
}
}
}
diff --git a/osu.Game/Screens/Select/PlayBeatmapDetailArea.cs b/osu.Game/Screens/Select/PlayBeatmapDetailArea.cs
new file mode 100644
index 0000000000..d719502a4f
--- /dev/null
+++ b/osu.Game/Screens/Select/PlayBeatmapDetailArea.cs
@@ -0,0 +1,143 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Screens.Select.Leaderboards;
+
+namespace osu.Game.Screens.Select
+{
+ public class PlayBeatmapDetailArea : BeatmapDetailArea
+ {
+ public readonly BeatmapLeaderboard Leaderboard;
+
+ public override WorkingBeatmap Beatmap
+ {
+ get => base.Beatmap;
+ set
+ {
+ base.Beatmap = value;
+
+ Leaderboard.Beatmap = value is DummyWorkingBeatmap ? null : value?.BeatmapInfo;
+ }
+ }
+
+ private Bindable<TabType> selectedTab;
+
+ public PlayBeatmapDetailArea()
+ {
+ Add(Leaderboard = new BeatmapLeaderboard { RelativeSizeAxes = Axes.Both });
+ }
+
+ [BackgroundDependencyLoader]
+ private void load(OsuConfigManager config)
+ {
+ selectedTab = config.GetBindable<TabType>(OsuSetting.BeatmapDetailTab);
+ selectedTab.BindValueChanged(tab => CurrentTab.Value = getTabItemFromTabType(tab.NewValue), true);
+ CurrentTab.BindValueChanged(tab => selectedTab.Value = getTabTypeFromTabItem(tab.NewValue));
+ }
+
+ public override void Refresh()
+ {
+ base.Refresh();
+
+ Leaderboard.RefreshScores();
+ }
+
+ protected override void OnTabChanged(BeatmapDetailAreaTabItem tab, bool selectedMods)
+ {
+ base.OnTabChanged(tab, selectedMods);
+
+ Leaderboard.FilterMods = selectedMods;
+
+ switch (tab)
+ {
+ case BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope> leaderboard:
+ Leaderboard.Scope = leaderboard.Scope;
+ Leaderboard.Show();
+ break;
+
+ default:
+ Leaderboard.Hide();
+ break;
+ }
+ }
+
+ protected override BeatmapDetailAreaTabItem[] CreateTabItems() => base.CreateTabItems().Concat(new BeatmapDetailAreaTabItem[]
+ {
+ new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Local),
+ new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Country),
+ new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Global),
+ new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Friend),
+ }).ToArray();
+
+ private BeatmapDetailAreaTabItem getTabItemFromTabType(TabType type)
+ {
+ switch (type)
+ {
+ case TabType.Details:
+ return new BeatmapDetailAreaDetailTabItem();
+
+ case TabType.Local:
+ return new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Local);
+
+ case TabType.Country:
+ return new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Country);
+
+ case TabType.Global:
+ return new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Global);
+
+ case TabType.Friends:
+ return new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Friend);
+
+ default:
+ throw new ArgumentOutOfRangeException(nameof(type));
+ }
+ }
+
+ private TabType getTabTypeFromTabItem(BeatmapDetailAreaTabItem item)
+ {
+ switch (item)
+ {
+ case BeatmapDetailAreaDetailTabItem _:
+ return TabType.Details;
+
+ case BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope> leaderboardTab:
+ switch (leaderboardTab.Scope)
+ {
+ case BeatmapLeaderboardScope.Local:
+ return TabType.Local;
+
+ case BeatmapLeaderboardScope.Country:
+ return TabType.Country;
+
+ case BeatmapLeaderboardScope.Global:
+ return TabType.Global;
+
+ case BeatmapLeaderboardScope.Friend:
+ return TabType.Friends;
+
+ default:
+ throw new ArgumentOutOfRangeException(nameof(item));
+ }
+
+ default:
+ throw new ArgumentOutOfRangeException(nameof(item));
+ }
+ }
+
+ public enum TabType
+ {
+ Details,
+ Local,
+ Country,
+ Global,
+ Friends
+ }
+ }
+}
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index f1dd125362..e744fd6a7b 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -29,8 +29,12 @@ namespace osu.Game.Screens.Select
ValidForResume = false;
Edit();
}, Key.Number4);
+
+ ((PlayBeatmapDetailArea)BeatmapDetails).Leaderboard.ScoreSelected += score => this.Push(new SoloResults(score));
}
+ protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
+
public override void OnResuming(IScreen last)
{
base.OnResuming(last);
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 0da260d752..67626d1e4f 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -23,7 +23,6 @@ using osu.Game.Rulesets.Mods;
using osu.Game.Screens.Backgrounds;
using osu.Game.Screens.Edit;
using osu.Game.Screens.Menu;
-using osu.Game.Screens.Play;
using osu.Game.Screens.Select.Options;
using osu.Game.Skinning;
using osuTK;
@@ -207,11 +206,11 @@ namespace osu.Game.Screens.Select
Left = left_area_padding,
Right = left_area_padding * 2,
},
- Child = BeatmapDetails = new BeatmapDetailArea
+ Child = BeatmapDetails = CreateBeatmapDetailArea().With(d =>
{
- RelativeSizeAxes = Axes.Both,
- Padding = new MarginPadding { Top = 10, Right = 5 },
- },
+ d.RelativeSizeAxes = Axes.Both;
+ d.Padding = new MarginPadding { Top = 10, Right = 5 };
+ })
},
}
},
@@ -262,8 +261,6 @@ namespace osu.Game.Screens.Select
});
}
- BeatmapDetails.Leaderboard.ScoreSelected += score => this.Push(new SoloResults(score));
-
if (Footer != null)
{
Footer.AddButton(new FooterButtonMods { Current = Mods }, ModSelect);
@@ -319,6 +316,11 @@ namespace osu.Game.Screens.Select
return dependencies;
}
+ /// <summary>
+ /// Creates the beatmap details to be displayed underneath the wedge.
+ /// </summary>
+ protected abstract BeatmapDetailArea CreateBeatmapDetailArea();
+
public void Edit(BeatmapInfo beatmap = null)
{
if (!AllowEditing)
@@ -533,7 +535,7 @@ namespace osu.Game.Screens.Select
Carousel.AllowSelection = true;
- BeatmapDetails.Leaderboard.RefreshScores();
+ BeatmapDetails.Refresh();
Beatmap.Value.Track.Looping = true;
music?.ResetTrackAdjustments();
@@ -716,7 +718,7 @@ namespace osu.Game.Screens.Select
dialogOverlay?.Push(new BeatmapClearScoresDialog(beatmap, () =>
// schedule done here rather than inside the dialog as the dialog may fade out and never callback.
- Schedule(() => BeatmapDetails.Leaderboard.RefreshScores())));
+ Schedule(() => BeatmapDetails.Refresh())));
}
public virtual bool OnPressed(GlobalAction action)
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 94611317d5..29bcd2e210 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -54,6 +54,8 @@ namespace osu.Game.Skinning
{
Samples = audioManager?.GetSampleStore(storage);
Textures = new TextureStore(new TextureLoaderStore(storage));
+
+ (storage as ResourceStore<byte[]>)?.AddExtension("ogg");
}
}
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index fc6afd0b27..a78c04ecd4 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -21,7 +21,8 @@ namespace osu.Game.Skinning
private SampleChannel[] channels;
- private ISampleStore samples;
+ [Resolved]
+ private ISampleStore samples { get; set; }
public SkinnableSound(IEnumerable<ISampleInfo> hitSamples)
{
@@ -33,12 +34,6 @@ namespace osu.Game.Skinning
this.hitSamples = new[] { hitSamples };
}
- [BackgroundDependencyLoader]
- private void load(ISampleStore samples)
- {
- this.samples = samples;
- }
-
private bool looping;
public bool Looping
diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
new file mode 100644
index 0000000000..7a5328d30c
--- /dev/null
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -0,0 +1,160 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. 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.Text.RegularExpressions;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Skinning;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual
+{
+ public abstract class SkinnableTestScene : OsuGridTestScene
+ {
+ private Skin metricsSkin;
+ private Skin defaultSkin;
+ private Skin specialSkin;
+ private Skin oldSkin;
+
+ protected SkinnableTestScene()
+ : base(2, 3)
+ {
+ }
+
+ [BackgroundDependencyLoader]
+ private void load(AudioManager audio, SkinManager skinManager)
+ {
+ var dllStore = new DllResourceStore(GetType().Assembly);
+
+ metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), audio, true);
+ defaultSkin = skinManager.GetSkin(DefaultLegacySkin.Info);
+ specialSkin = new TestLegacySkin(new SkinInfo { Name = "special-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/special_skin"), audio, true);
+ oldSkin = new TestLegacySkin(new SkinInfo { Name = "old-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/old_skin"), audio, true);
+ }
+
+ private readonly List<Drawable> createdDrawables = new List<Drawable>();
+
+ public void SetContents(Func<Drawable> creationFunction)
+ {
+ createdDrawables.Clear();
+
+ Cell(0).Child = createProvider(null, creationFunction);
+ Cell(1).Child = createProvider(metricsSkin, creationFunction);
+ Cell(2).Child = createProvider(defaultSkin, creationFunction);
+ Cell(3).Child = createProvider(specialSkin, creationFunction);
+ Cell(4).Child = createProvider(oldSkin, creationFunction);
+ }
+
+ protected IEnumerable<Drawable> CreatedDrawables => createdDrawables;
+
+ private Drawable createProvider(Skin skin, Func<Drawable> creationFunction)
+ {
+ var created = creationFunction();
+ createdDrawables.Add(created);
+
+ var autoSize = created.RelativeSizeAxes == Axes.None;
+
+ var mainProvider = new SkinProvidingContainer(skin)
+ {
+ RelativeSizeAxes = !autoSize ? Axes.Both : Axes.None,
+ AutoSizeAxes = autoSize ? Axes.Both : Axes.None,
+ };
+
+ return new Container
+ {
+ RelativeSizeAxes = Axes.Both,
+ BorderColour = Color4.White,
+ BorderThickness = 5,
+ Masking = true,
+
+ Children = new Drawable[]
+ {
+ new Box
+ {
+ AlwaysPresent = true,
+ Alpha = 0,
+ RelativeSizeAxes = Axes.Both,
+ },
+ new OsuSpriteText
+ {
+ Text = skin?.SkinInfo?.Name ?? "none",
+ Scale = new Vector2(1.5f),
+ Padding = new MarginPadding(5),
+ },
+ new Container
+ {
+ RelativeSizeAxes = !autoSize ? Axes.Both : Axes.None,
+ AutoSizeAxes = autoSize ? Axes.Both : Axes.None,
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ Children = new Drawable[]
+ {
+ new OutlineBox { Alpha = autoSize ? 1 : 0 },
+ mainProvider.WithChild(
+ new SkinProvidingContainer(Ruleset.Value.CreateInstance().CreateLegacySkinProvider(mainProvider))
+ {
+ Child = created,
+ RelativeSizeAxes = !autoSize ? Axes.Both : Axes.None,
+ AutoSizeAxes = autoSize ? Axes.Both : Axes.None,
+ }
+ )
+ }
+ },
+ }
+ };
+ }
+
+ private class OutlineBox : CompositeDrawable
+ {
+ public OutlineBox()
+ {
+ BorderColour = Color4.IndianRed;
+ BorderThickness = 5;
+ Masking = true;
+ RelativeSizeAxes = Axes.Both;
+
+ InternalChild = new Box
+ {
+ RelativeSizeAxes = Axes.Both,
+ Alpha = 0,
+ Colour = Color4.Brown,
+ AlwaysPresent = true
+ };
+ }
+ }
+
+ private class TestLegacySkin : LegacySkin
+ {
+ private readonly bool extrapolateAnimations;
+
+ public TestLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, AudioManager audioManager, bool extrapolateAnimations)
+ : base(skin, storage, audioManager, "skin.ini")
+ {
+ this.extrapolateAnimations = extrapolateAnimations;
+ }
+
+ public override Texture GetTexture(string componentName)
+ {
+ // extrapolate frames to test longer animations
+ if (extrapolateAnimations)
+ {
+ var match = Regex.Match(componentName, "-([0-9]*)");
+
+ if (match.Length > 0 && int.TryParse(match.Groups[1].Value, out var number) && number < 60)
+ return base.GetTexture(componentName.Replace($"-{number}", $"-{number % 2}"));
+ }
+
+ return base.GetTexture(componentName);
+ }
+ }
+ }
+}
diff --git a/osu.Game/Updater/SimpleUpdateManager.cs b/osu.Game/Updater/SimpleUpdateManager.cs
index 5412b11b33..e490ac14e9 100644
--- a/osu.Game/Updater/SimpleUpdateManager.cs
+++ b/osu.Game/Updater/SimpleUpdateManager.cs
@@ -20,12 +20,13 @@ namespace osu.Game.Updater
public class SimpleUpdateManager : UpdateManager
{
private string version;
- private GameHost host;
+
+ [Resolved]
+ private GameHost host { get; set; }
[BackgroundDependencyLoader]
- private void load(OsuGameBase game, GameHost host)
+ private void load(OsuGameBase game)
{
- this.host = host;
version = game.Version;
if (game.IsDeployedBuild)
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 50d8c25b11..6b8f8fee8c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -22,9 +22,9 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
- <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
- <PackageReference Include="ppy.osu.Framework" Version="2020.213.0" />
- <PackageReference Include="Sentry" Version="2.0.2" />
+ <PackageReference Include="ppy.osu.Game.Resources" Version="2020.219.0" />
+ <PackageReference Include="ppy.osu.Framework" Version="2020.218.0" />
+ <PackageReference Include="Sentry" Version="2.0.3" />
<PackageReference Include="SharpCompress" Version="0.24.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index e56fc41b07..f68bedc57f 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -73,8 +73,8 @@
<Reference Include="System.Net.Http" />
</ItemGroup>
<ItemGroup Label="Package References">
- <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
- <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.213.0" />
+ <PackageReference Include="ppy.osu.Game.Resources" Version="2020.219.0" />
+ <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.218.0" />
</ItemGroup>
<!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
<ItemGroup Label="Transitive Dependencies">
@@ -82,11 +82,11 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
- <PackageReference Include="ppy.osu.Framework" Version="2020.213.0" />
+ <PackageReference Include="ppy.osu.Framework" Version="2020.218.0" />
<PackageReference Include="SharpCompress" Version="0.24.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="SharpRaven" Version="2.4.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
- <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2019.1104.0" ExcludeAssets="all" />
+ <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2020.213.0" ExcludeAssets="all" />
</ItemGroup>
</Project>