h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 03:22:54 +08:00
Code Issues Releases Wiki Activity

Fix sections scroll container not handling fixed header in scrolls

Browse Source
This commit is contained in:
Salman Ahmed 2022-04-23 06:03:54 +03:00
parent 05736fb84c
commit 3700c607d8
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Graphics/Containers/SectionsContainer.cs
View File

@ -149,13 +149,11 @@ namespace osu.Game.Graphics.Containers
{ {
lastKnownScroll = null; lastKnownScroll = null;
float fixedHeaderSize = FixedHeader?.BoundingBox.Height ?? 0;
// implementation similar to ScrollIntoView but a bit more nuanced. // implementation similar to ScrollIntoView but a bit more nuanced.
float top = scrollContainer.GetChildPosInContent(target); float top = scrollContainer.GetChildPosInContent(target);
float bottomScrollExtent = scrollContainer.ScrollableExtent - fixedHeaderSize; float bottomScrollExtent = scrollContainer.ScrollableExtent;
float scrollTarget = top - fixedHeaderSize - scrollContainer.DisplayableContent * scroll_y_centre; float scrollTarget = top - scrollContainer.DisplayableContent * scroll_y_centre;
if (scrollTarget > bottomScrollExtent) if (scrollTarget > bottomScrollExtent)
scrollContainer.ScrollToEnd(); scrollContainer.ScrollToEnd();
@ -270,9 +268,13 @@ namespace osu.Game.Graphics.Containers
{ {
if (!Children.Any()) return; if (!Children.Any()) return;
var newMargin = originalSectionsMargin; // if a fixed header is present, apply top padding for it
// to make the scroll container aware of its displayable area.
// (i.e. for page up/down to work properly)
scrollContainer.Padding = new MarginPadding { Top = FixedHeader?.LayoutSize.Y ?? 0 };
newMargin.Top += (headerHeight ?? 0); var newMargin = originalSectionsMargin;
newMargin.Top += (ExpandableHeader?.LayoutSize.Y ?? 0);
newMargin.Bottom += (footerHeight ?? 0); newMargin.Bottom += (footerHeight ?? 0);
scrollContentContainer.Margin = newMargin; scrollContentContainer.Margin = newMargin;