sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 06:36:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into multiplayer-force-start-2

Browse Source
This commit is contained in:
Dean Herbert
2022-04-29 14:45:40 +09:00
committed by GitHub
parent 1d8ac6917d 0889cd8407
commit 1f1845d69b
112 changed files with 2645 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Tests/Visual/OsuGameTestScene.cs
View File

@ -23,6 +23,7 @@ using osu.Game.Rulesets.Mods;
using osu.Game.Scoring;
using osu.Game.Screens;
using osu.Game.Screens.Menu;
using osu.Game.Screens.Play;
using osuTK.Graphics;
using IntroSequence = osu.Game.Configuration.IntroSequence;
@ -106,6 +107,11 @@ namespace osu.Game.Tests.Visual
protected void ConfirmAtMainMenu() => AddUntilStep("Wait for main menu", () => Game.ScreenStack.CurrentScreen is MainMenu menu && menu.IsLoaded);
/// <summary>
/// Dismisses any notifications pushed which block from interacting with the game (or block screens from loading, e.g. <see cref="Player"/>).
/// </summary>
protected void DismissAnyNotifications() => Game.Notifications.State.Value = Visibility.Hidden;
public class TestOsuGame : OsuGame
{
public new const float SIDE_OVERLAY_OFFSET_RATIO = OsuGame.SIDE_OVERLAY_OFFSET_RATIO;

18
osu.Game/Tests/Visual/SkinnableTestScene.cs
View File

@ -74,11 +74,15 @@ namespace osu.Game.Tests.Visual
createdDrawables.Add(created);
SkinProvidingContainer mainProvider;
Container childContainer;
OutlineBox outlineBox;
SkinProvidingContainer skinProvider;
ISkin provider = skin;
if (provider is LegacySkin legacyProvider)
provider = Ruleset.Value.CreateInstance().CreateLegacySkinProvider(legacyProvider, beatmap);
var children = new Container
{
RelativeSizeAxes = Axes.Both,
@ -107,12 +111,10 @@ namespace osu.Game.Tests.Visual
Children = new Drawable[]
{
outlineBox = new OutlineBox(),
(mainProvider = new SkinProvidingContainer(skin)).WithChild(
skinProvider = new SkinProvidingContainer(Ruleset.Value.CreateInstance().CreateLegacySkinProvider(mainProvider, beatmap))
{
Child = created,
}
)
skinProvider = new SkinProvidingContainer(provider)
{
Child = created,
}
}
},
}
@ -130,7 +132,7 @@ namespace osu.Game.Tests.Visual
{
bool autoSize = created.RelativeSizeAxes == Axes.None;
foreach (var c in new[] { mainProvider, childContainer, skinProvider })
foreach (var c in new[] { childContainer, skinProvider })
{
c.RelativeSizeAxes = Axes.None;
c.AutoSizeAxes = Axes.None;