h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 10:12:54 +08:00
Code Issues Releases Wiki Activity

Merge pull request #18133 from frenzibyte/change-mod-scroll-behaviour

Browse Source 
Change mod scrolling behaviour to not scroll horizontally on columns/settings
This commit is contained in:
Bartłomiej Dach 2022-05-07 13:51:13 +02:00 committed by GitHub
commit c907dbe56f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Mods/ModColumn.cs
View File

@ -188,7 +188,7 @@ namespace osu.Game.Overlays.Mods
},
new Drawable[]
{
new NestedVerticalScrollContainer
new OsuScrollContainer(Direction.Vertical)
{
RelativeSizeAxes = Axes.Both,
ClampExtension = 100,

2
osu.Game/Overlays/Mods/ModSettingsArea.cs
View File

@ -158,7 +158,7 @@ namespace osu.Game.Overlays.Mods
new[] { Empty() },
new Drawable[]
{
new NestedVerticalScrollContainer
new OsuScrollContainer(Direction.Vertical)
{
RelativeSizeAxes = Axes.Both,
ClampExtension = 100,

48
osu.Game/Overlays/Mods/NestedVerticalScrollContainer.cs
View File

@ -1,48 +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.
#nullable enable
using osu.Framework.Graphics;
using osu.Framework.Input.Events;
using osu.Game.Graphics.Containers;
namespace osu.Game.Overlays.Mods
{
/// <summary>
/// A scroll container that handles the case of vertically scrolling content inside a larger horizontally scrolling parent container.
/// </summary>
public class NestedVerticalScrollContainer : OsuScrollContainer
{
private ModSelectScreen.ColumnScrollContainer? parentScrollContainer;
protected override void LoadComplete()
{
base.LoadComplete();
parentScrollContainer = this.FindClosestParent<ModSelectScreen.ColumnScrollContainer>();
}
protected override bool OnScroll(ScrollEvent e)
{
if (parentScrollContainer == null)
return base.OnScroll(e);
bool topRightInView = parentScrollContainer.ScreenSpaceDrawQuad.Contains(ScreenSpaceDrawQuad.TopRight);
bool bottomLeftInView = parentScrollContainer.ScreenSpaceDrawQuad.Contains(ScreenSpaceDrawQuad.BottomLeft);
// If not completely on-screen, handle scroll but also allow parent to scroll at the same time (to hopefully bring our content into full view).
if (!topRightInView || !bottomLeftInView)
return false;
bool scrollingPastEnd = e.ScrollDelta.Y < 0 && IsScrolledToEnd();
bool scrollingPastStart = e.ScrollDelta.Y > 0 && Target <= 0;
// If at either of our extents, delegate scroll to the horizontal parent container.
if (scrollingPastStart || scrollingPastEnd)
return false;
return base.OnScroll(e);
}
}
}