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

Replace nan usage with nullable float

Browse Source
This commit is contained in:
Dean Herbert 2021-01-21 14:31:31 +09:00
parent 8f9089d1ae
commit 555abcdc36
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@ namespace osu.Game.Graphics.Containers
if (value == null) return; if (value == null) return;
AddInternal(expandableHeader); AddInternal(expandableHeader);
lastKnownScroll = float.NaN; lastKnownScroll = null;
} }
} }
@ -56,7 +56,7 @@ namespace osu.Game.Graphics.Containers
if (value == null) return; if (value == null) return;
AddInternal(fixedHeader); AddInternal(fixedHeader);
lastKnownScroll = float.NaN; lastKnownScroll = null;
} }
} }
@ -75,7 +75,7 @@ namespace osu.Game.Graphics.Containers
footer.Anchor |= Anchor.y2; footer.Anchor |= Anchor.y2;
footer.Origin |= Anchor.y2; footer.Origin |= Anchor.y2;
scrollContainer.Add(footer); scrollContainer.Add(footer);
lastKnownScroll = float.NaN; lastKnownScroll = null;
} }
} }
@ -93,7 +93,7 @@ namespace osu.Game.Graphics.Containers
headerBackgroundContainer.Add(headerBackground); headerBackgroundContainer.Add(headerBackground);
lastKnownScroll = float.NaN; lastKnownScroll = null;
} }
} }
@ -105,9 +105,9 @@ namespace osu.Game.Graphics.Containers
private Drawable expandableHeader, fixedHeader, footer, headerBackground; private Drawable expandableHeader, fixedHeader, footer, headerBackground;
private FlowContainer<T> scrollContentContainer; private FlowContainer<T> scrollContentContainer;
private float headerHeight, footerHeight; private float? headerHeight, footerHeight;
private float lastKnownScroll; private float? lastKnownScroll;
private const float scroll_target_multiplier = 0.2f; private const float scroll_target_multiplier = 0.2f;
@ -137,9 +137,9 @@ namespace osu.Game.Graphics.Containers
Debug.Assert(drawable != null); Debug.Assert(drawable != null);
lastKnownScroll = float.NaN; lastKnownScroll = null;
headerHeight = float.NaN; headerHeight = null;
footerHeight = float.NaN; footerHeight = null;
if (smallestSection == null || smallestSection.Height > drawable.Height) if (smallestSection == null || smallestSection.Height > drawable.Height)
smallestSection = drawable; smallestSection = drawable;
@ -171,7 +171,7 @@ namespace osu.Game.Graphics.Containers
if (source == InvalidationSource.Child && (invalidation & Invalidation.DrawSize) != 0) if (source == InvalidationSource.Child && (invalidation & Invalidation.DrawSize) != 0)
{ {
lastKnownScroll = -1; lastKnownScroll = null;
result = true; result = true;
} }
@ -242,8 +242,9 @@ namespace osu.Game.Graphics.Containers
if (!Children.Any()) return; if (!Children.Any()) return;
var newMargin = originalSectionsMargin; var newMargin = originalSectionsMargin;
newMargin.Top += headerHeight;
newMargin.Bottom += footerHeight; newMargin.Top += (headerHeight ?? 0);
newMargin.Bottom += (footerHeight ?? 0);
scrollContentContainer.Margin = newMargin; scrollContentContainer.Margin = newMargin;
} }