mirror of
https://github.com/ppy/osu.git
synced 2024-12-16 05:42:54 +08:00
Merge pull request #18155 from frenzibyte/results-screen-scaling
Remove dual-direction mouse wheel scrolling at results screen
This commit is contained in:
commit
2aa5524c8f
@ -8,11 +8,23 @@ using osu.Game.Online.Rooms;
|
|||||||
using osu.Game.Rulesets.Osu;
|
using osu.Game.Rulesets.Osu;
|
||||||
using osu.Game.Screens.OnlinePlay.Multiplayer;
|
using osu.Game.Screens.OnlinePlay.Multiplayer;
|
||||||
using osu.Game.Tests.Resources;
|
using osu.Game.Tests.Resources;
|
||||||
|
using osuTK;
|
||||||
|
|
||||||
namespace osu.Game.Tests.Visual.Multiplayer
|
namespace osu.Game.Tests.Visual.Multiplayer
|
||||||
{
|
{
|
||||||
public class TestSceneMultiplayerTeamResults : ScreenTestScene
|
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(7483253, 1048576)]
|
||||||
[TestCase(1048576, 7483253)]
|
[TestCase(1048576, 7483253)]
|
||||||
[TestCase(1048576, 1048576)]
|
[TestCase(1048576, 1048576)]
|
||||||
|
@ -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]
|
[Test]
|
||||||
public void TestResultsWithoutPlayer()
|
public void TestResultsWithoutPlayer()
|
||||||
{
|
{
|
||||||
|
@ -85,7 +85,6 @@ namespace osu.Game.Screens.Ranking
|
|||||||
InternalChild = scroll = new Scroll
|
InternalChild = scroll = new Scroll
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.Both,
|
RelativeSizeAxes = Axes.Both,
|
||||||
HandleScroll = () => expandedPanel?.IsHovered != true, // handle horizontal scroll only when not hovering the expanded panel.
|
|
||||||
Child = flow = new Flow
|
Child = flow = new Flow
|
||||||
{
|
{
|
||||||
Anchor = Anchor.Centre,
|
Anchor = Anchor.Centre,
|
||||||
@ -359,11 +358,6 @@ namespace osu.Game.Screens.Ranking
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public float? InstantScrollTarget;
|
public float? InstantScrollTarget;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Whether this container should handle scroll trigger events.
|
|
||||||
/// </summary>
|
|
||||||
public Func<bool> HandleScroll;
|
|
||||||
|
|
||||||
protected override void UpdateAfterChildren()
|
protected override void UpdateAfterChildren()
|
||||||
{
|
{
|
||||||
if (InstantScrollTarget != null)
|
if (InstantScrollTarget != null)
|
||||||
@ -374,10 +368,6 @@ namespace osu.Game.Screens.Ranking
|
|||||||
|
|
||||||
base.UpdateAfterChildren();
|
base.UpdateAfterChildren();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override bool HandlePositionalInput => HandleScroll();
|
|
||||||
|
|
||||||
public override bool HandleNonPositionalInput => HandleScroll();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user