Merge branch 'master' into fix-lead-in-issues

osu.Game.Tests/Visual/Gameplay/TestCasePlayerLoader.cs

@@ -10,21 +10,25 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens;
 using osu.Game.Screens.Play;
+using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestCasePlayerLoader : ManualInputManagerTestCase
     {
         private PlayerLoader loader;
-        private readonly OsuScreenStack stack;
+        private OsuScreenStack stack;
 
-        public TestCasePlayerLoader()
+        [SetUp]
+        public void Setup() => Schedule(() =>
         {
-            InputManager.Add(stack = new OsuScreenStack { RelativeSizeAxes = Axes.Both });
+            InputManager.Child = stack = new OsuScreenStack { RelativeSizeAxes = Axes.Both };
-        }
+            Beatmap.Value = new TestWorkingBeatmap(new TestBeatmap(new OsuRuleset().RulesetInfo), Clock);
+        });
 
         [Test]
         public void TestLoadContinuation()
@@ -33,8 +37,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for current", () => loader.IsCurrentScreen());
             AddStep("mouse in centre", () => InputManager.MoveMouseTo(loader.ScreenSpaceDrawQuad.Centre));
             AddUntilStep("wait for no longer current", () => !loader.IsCurrentScreen());
-            AddStep("exit loader", () => loader.Exit());
-            AddUntilStep("wait for no longer alive", () => !loader.IsAlive);
             AddStep("load slow dummy beatmap", () =>
             {
                 SlowLoadPlayer slow = null;
@@ -58,41 +60,25 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("load player", () =>
             {
                 Mods.Value = new[] { gameMod = new TestMod() };
-                InputManager.MoveMouseTo(loader.ScreenSpaceDrawQuad.Centre);
+                stack.Push(loader = new PlayerLoader(() => player = new TestPlayer()));
-                stack.Push(new PlayerLoader(() => player = new TestPlayer()));
-            });
-
-            AddUntilStep("wait for player to become current", () =>
-            {
-                if (player.IsCurrentScreen())
-                {
-                    playerMod1 = (TestMod)player.Mods.Value.Single();
-                    return true;
-                }
-
-                return false;
             });
 
+            AddUntilStep("wait for loader to become current", () => loader.IsCurrentScreen());
+            AddStep("mouse in centre", () => InputManager.MoveMouseTo(loader.ScreenSpaceDrawQuad.Centre));
+            AddUntilStep("wait for player to be current", () => player.IsCurrentScreen());
+            AddStep("retrieve mods", () => playerMod1 = (TestMod)player.Mods.Value.Single());
             AddAssert("game mods not applied", () => gameMod.Applied == false);
             AddAssert("player mods applied", () => playerMod1.Applied);
 
             AddStep("restart player", () =>
             {
+                var lastPlayer = player;
                 player = null;
-                player.Restart();
+                lastPlayer.Restart();
-            });
-
-            AddUntilStep("wait for player to become current", () =>
-            {
-                if (player.IsCurrentScreen())
-                {
-                    playerMod2 = (TestMod)player.Mods.Value.Single();
-                    return true;
-                }
-
-                return false;
             });
 
+            AddUntilStep("wait for player to be current", () => player.IsCurrentScreen());
+            AddStep("retrieve mods", () => playerMod2 = (TestMod)player.Mods.Value.Single());
             AddAssert("game mods not applied", () => gameMod.Applied == false);
             AddAssert("player has different mods", () => playerMod1 != playerMod2);
             AddAssert("player mods applied", () => playerMod2.Applied);

osu.Game.Tests/Visual/Menus/TestCaseLoaderAnimation.cs

@@ -23,7 +23,11 @@ namespace osu.Game.Tests.Visual.Menus
 
         public TestCaseLoaderAnimation()
         {
-            Child = logo = new OsuLogo { Depth = float.MinValue };
+            Child = logo = new OsuLogo
+            {
+                Alpha = 0,
+                Depth = float.MinValue
+            };
         }
 
         [Test]
@@ -39,7 +43,7 @@ namespace osu.Game.Tests.Visual.Menus
                 LoadScreen(loader);
             });
 
-            AddAssert("loaded", () =>
+            AddUntilStep("loaded", () =>
             {
                 logoVisible = loader.Logo?.Alpha > 0;
                 return loader.Logo != null && loader.ScreenLoaded;

osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs

@@ -92,13 +92,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
-        protected override void Update()
-        {
-            base.Update();
-
-            zoomedContent.Width = DrawWidth * currentZoom;
-        }
-
         protected override bool OnScroll(ScrollEvent e)
         {
             if (e.IsPrecise)
@@ -169,6 +162,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 float targetOffset = expectedWidth * (focusPoint / contentSize) - focusOffset;
 
                 d.currentZoom = newZoom;
+
+                d.zoomedContent.Width = d.DrawWidth * d.currentZoom;
+                // Temporarily here to make sure ScrollTo gets the correct DrawSize for scrollable area.
+                // TODO: Make sure draw size gets invalidated properly on the framework side, and remove this once it is.
+                d.Invalidate(Invalidation.DrawSize);
                 d.ScrollTo(targetOffset, false);
             }
 

osu.Game/Tests/Visual/PlayerTestCase.cs

@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual
         public void SetUpSteps()
         {
             AddStep(ruleset.RulesetInfo.Name, loadPlayer);
-            AddUntilStep(() => Player.IsLoaded, "player loaded");
+            AddUntilStep(() => Player.IsLoaded && Player.Alpha == 1, "player loaded");
         }
 
         protected virtual IBeatmap CreateBeatmap(Ruleset ruleset) => new TestBeatmap(ruleset.RulesetInfo);

osu.Game/osu.Game.csproj

@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.3" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.128.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2019.415.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.425.0" />
     <PackageReference Include="SharpCompress" Version="0.23.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

osu.iOS.props

@@ -105,8 +105,8 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.128.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2019.415.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.425.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.415.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.425.0" />
     <PackageReference Include="SharpCompress" Version="0.22.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />