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

Extract out commonly used variables

Browse Source
This commit is contained in:
Dean Herbert 2021-01-21 14:52:41 +09:00
parent a85f952a38
commit 9daf29fedc
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,7 +178,10 @@ namespace osu.Game.Graphics.Containers
{ {
base.UpdateAfterChildren(); base.UpdateAfterChildren();
float headerH = (ExpandableHeader?.LayoutSize.Y ?? 0) + (FixedHeader?.LayoutSize.Y ?? 0); float fixedHeaderSize = (FixedHeader?.LayoutSize.Y ?? 0);
float expandableHeaderSize = ExpandableHeader?.LayoutSize.Y ?? 0;
float headerH = expandableHeaderSize + fixedHeaderSize;
float footerH = Footer?.LayoutSize.Y ?? 0; float footerH = Footer?.LayoutSize.Y ?? 0;
if (headerH != headerHeight || footerH != footerHeight) if (headerH != headerHeight || footerH != footerHeight)
@ -200,13 +203,13 @@ namespace osu.Game.Graphics.Containers
if (ExpandableHeader != null && FixedHeader != null) if (ExpandableHeader != null && FixedHeader != null)
{ {
float offset = Math.Min(ExpandableHeader.LayoutSize.Y, currentScroll); float offset = Math.Min(expandableHeaderSize, currentScroll);
ExpandableHeader.Y = -offset; ExpandableHeader.Y = -offset;
FixedHeader.Y = -offset + ExpandableHeader.LayoutSize.Y; FixedHeader.Y = -offset + expandableHeaderSize;
} }
headerBackgroundContainer.Height = (ExpandableHeader?.LayoutSize.Y ?? 0) + (FixedHeader?.LayoutSize.Y ?? 0); headerBackgroundContainer.Height = expandableHeaderSize + fixedHeaderSize;
headerBackgroundContainer.Y = ExpandableHeader?.Y ?? 0; headerBackgroundContainer.Y = ExpandableHeader?.Y ?? 0;
var smallestSectionHeight = Children.Count > 0 ? Children.Min(d => d.Height) : 0; var smallestSectionHeight = Children.Count > 0 ? Children.Min(d => d.Height) : 0;
@ -216,7 +219,7 @@ namespace osu.Game.Graphics.Containers
// but the 5% can't be bigger than our smallest section height, otherwise it won't get selected correctly // but the 5% can't be bigger than our smallest section height, otherwise it won't get selected correctly
float sectionOrContent = Math.Min(smallestSectionHeight / 2.0f, scrollContainer.DisplayableContent * 0.05f); float sectionOrContent = Math.Min(smallestSectionHeight / 2.0f, scrollContainer.DisplayableContent * 0.05f);
float scrollOffset = (FixedHeader?.LayoutSize.Y ?? 0) + scrollContainer.DisplayableContent * scroll_target_multiplier + sectionOrContent; float scrollOffset = fixedHeaderSize + scrollContainer.DisplayableContent * scroll_target_multiplier + sectionOrContent;
if (Precision.AlmostBigger(0, scrollContainer.Current)) if (Precision.AlmostBigger(0, scrollContainer.Current))
SelectedSection.Value = lastClickedSection as T ?? Children.FirstOrDefault(); SelectedSection.Value = lastClickedSection as T ?? Children.FirstOrDefault();