RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-16 11:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use LayoutSize for header and footer layout.

Browse Source
This commit is contained in:
Huo Yaoyuan 2017-05-21 04:01:07 +08:00
parent 35712514a4
commit a98f109d73
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,8 +130,8 @@ namespace osu.Game.Graphics.Containers
{
base.UpdateAfterChildren();
float headerHeight = (ExpandableHeader?.Height ?? 0) + (FixedHeader?.Height ?? 0);
float footerHeight = Footer?.Height ?? 0;
float headerHeight = (ExpandableHeader?.LayoutSize.Y ?? 0) + (FixedHeader?.LayoutSize.Y ?? 0);
float footerHeight = Footer?.LayoutSize.Y ?? 0;
if (headerHeight != this.headerHeight || footerHeight != this.footerHeight)
{
this.headerHeight = headerHeight;
@ -146,10 +146,10 @@ namespace osu.Game.Graphics.Containers
if (expandableHeader != null && fixedHeader != null)
{
float offset = Math.Min(expandableHeader.Height, currentScroll);
float offset = Math.Min(expandableHeader.LayoutSize.Y, currentScroll);
expandableHeader.Y = -offset;
fixedHeader.Y = -offset + expandableHeader.Height;
fixedHeader.Y = -offset + expandableHeader.LayoutSize.Y;
}
Drawable bestMatch = null;