diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerTeamResults.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerTeamResults.cs
index bcb36a585f..0237298fa1 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerTeamResults.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerTeamResults.cs
@@ -8,11 +8,23 @@ using osu.Game.Online.Rooms;
using osu.Game.Rulesets.Osu;
using osu.Game.Screens.OnlinePlay.Multiplayer;
using osu.Game.Tests.Resources;
+using osuTK;
namespace osu.Game.Tests.Visual.Multiplayer
{
public class TestSceneMultiplayerTeamResults : ScreenTestScene
{
+ [Test]
+ public void TestScaling()
+ {
+ // scheduling is needed as scaling the content immediately causes the entire scene to shake badly, for some odd reason.
+ AddSliderStep("scale", 0.5f, 1.6f, 1f, v => Schedule(() =>
+ {
+ Stack.Scale = new Vector2(v);
+ Stack.Size = new Vector2(1f / v);
+ }));
+ }
+
[TestCase(7483253, 1048576)]
[TestCase(1048576, 7483253)]
[TestCase(1048576, 1048576)]
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index 4eed2a25f5..a1d51683e4 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -56,6 +56,17 @@ namespace osu.Game.Tests.Visual.Ranking
});
}
+ [Test]
+ public void TestScaling()
+ {
+ // scheduling is needed as scaling the content immediately causes the entire scene to shake badly, for some odd reason.
+ AddSliderStep("scale", 0.5f, 1.6f, 1f, v => Schedule(() =>
+ {
+ Content.Scale = new Vector2(v);
+ Content.Size = new Vector2(1f / v);
+ }));
+ }
+
[Test]
public void TestResultsWithoutPlayer()
{
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index c2ef5529e8..a5341242e2 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -85,7 +85,6 @@ namespace osu.Game.Screens.Ranking
InternalChild = scroll = new Scroll
{
RelativeSizeAxes = Axes.Both,
- HandleScroll = () => expandedPanel?.IsHovered != true, // handle horizontal scroll only when not hovering the expanded panel.
Child = flow = new Flow
{
Anchor = Anchor.Centre,
@@ -359,11 +358,6 @@ namespace osu.Game.Screens.Ranking
///
public float? InstantScrollTarget;
- ///
- /// Whether this container should handle scroll trigger events.
- ///
- public Func HandleScroll;
-
protected override void UpdateAfterChildren()
{
if (InstantScrollTarget != null)
@@ -374,10 +368,6 @@ namespace osu.Game.Screens.Ranking
base.UpdateAfterChildren();
}
-
- public override bool HandlePositionalInput => HandleScroll();
-
- public override bool HandleNonPositionalInput => HandleScroll();
}
}
}