h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 12:02:55 +08:00
Code Issues Releases Wiki Activity

Simplify and better comment nested scroll conditionals

Browse Source
This commit is contained in:
Dean Herbert 2022-04-05 16:48:25 +09:00
parent f156cb797d
commit 58e9147b12
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,11 +214,11 @@ namespace osu.Game.Overlays.Mods
if (parentScrollContainer == null)
return base.OnScroll(e);
// If not on screen, handle scroll but also allow parent to scroll at the same time.
bool topRightOutsideOfView = parentScrollContainer.ScreenSpaceDrawQuad.Contains(ScreenSpaceDrawQuad.TopRight) == false;
bool bottomLeftOutsideOfView = parentScrollContainer.ScreenSpaceDrawQuad.Contains(ScreenSpaceDrawQuad.BottomLeft) == false;
bool topRightInView = parentScrollContainer.ScreenSpaceDrawQuad.Contains(ScreenSpaceDrawQuad.TopRight);
bool bottomLeftInView = parentScrollContainer.ScreenSpaceDrawQuad.Contains(ScreenSpaceDrawQuad.BottomLeft);
if (topRightOutsideOfView || bottomLeftOutsideOfView)
// 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)
{
base.OnScroll(e);
return false;
@ -227,7 +227,7 @@ namespace osu.Game.Overlays.Mods
bool scrollingPastEnd = e.ScrollDelta.Y < 0 && IsScrolledToEnd();
bool scrollingPastStart = e.ScrollDelta.Y > 0 && Target <= 0;
// Same deal if at one of the two extents of the view.
// If at either of our extents, allow the parent scroll to handle as a horizontal scroll to view more content.
if (scrollingPastStart || scrollingPastEnd)
{
base.OnScroll(e);