1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-21 08:52:54 +08:00

Merge pull request #14601 from peppy/fix-editor-setup-screen-pixel-leakage

Fix pixels poking out of the top edge of editor setup screen
This commit is contained in:
Dan Balasescu 2021-09-02 14:03:37 +09:00 committed by GitHub
commit aadef41182
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -25,7 +25,7 @@ namespace osu.Game.Screens.Edit.Setup
{ {
AddRange(new Drawable[] AddRange(new Drawable[]
{ {
sections = new SectionsContainer<SetupSection> sections = new SetupScreenSectionsContainer
{ {
FixedHeader = header, FixedHeader = header,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
@ -40,5 +40,19 @@ namespace osu.Game.Screens.Edit.Setup
}, },
}); });
} }
private class SetupScreenSectionsContainer : SectionsContainer<SetupSection>
{
protected override UserTrackingScrollContainer CreateScrollContainer()
{
var scrollContainer = base.CreateScrollContainer();
// Workaround for masking issues (see https://github.com/ppy/osu-framework/issues/1675#issuecomment-910023157)
// Note that this actually causes the full scroll range to be reduced by 2px at the bottom, but it's not really noticeable.
scrollContainer.Margin = new MarginPadding { Top = 2 };
return scrollContainer;
}
}
} }
} }