h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-13 17:43:21 +08:00
Code Issues Releases Wiki Activity

Fix regression in nested scroll behaviour due to the top level scroll container's type changing

Browse Source
This commit is contained in:
Dean Herbert 2022-04-27 17:10:27 +09:00
parent a849bfcf60
commit 1a345c06c6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Overlays/Mods/ModSelectScreen.cs
View File

@ -320,7 +320,7 @@ namespace osu.Game.Overlays.Mods
} }
} }
private class ColumnScrollContainer : OsuScrollContainer<ColumnFlowContainer> internal class ColumnScrollContainer : OsuScrollContainer<ColumnFlowContainer>
{ {
public ColumnScrollContainer() public ColumnScrollContainer()
: base(Direction.Horizontal) : base(Direction.Horizontal)
@ -358,7 +358,7 @@ namespace osu.Game.Overlays.Mods
} }
} }
private class ColumnFlowContainer : FillFlowContainer<ColumnDimContainer> internal class ColumnFlowContainer : FillFlowContainer<ColumnDimContainer>
{ {
public IEnumerable<ModColumn> Columns => Children.Select(dimWrapper => dimWrapper.Column); public IEnumerable<ModColumn> Columns => Children.Select(dimWrapper => dimWrapper.Column);

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

@ -14,13 +14,13 @@ namespace osu.Game.Overlays.Mods
/// </summary> /// </summary>
public class NestedVerticalScrollContainer : OsuScrollContainer public class NestedVerticalScrollContainer : OsuScrollContainer
{ {
private OsuScrollContainer? parentScrollContainer; private ModSelectScreen.ColumnScrollContainer? parentScrollContainer;
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
parentScrollContainer = this.FindClosestParent<OsuScrollContainer>(); parentScrollContainer = this.FindClosestParent<ModSelectScreen.ColumnScrollContainer>();
} }
protected override bool OnScroll(ScrollEvent e) protected override bool OnScroll(ScrollEvent e)