Skip to content

Commit

Permalink
Add lenience to scrollbar visibility conditionals
Browse files Browse the repository at this point in the history
  • Loading branch information
frenzibyte committed Jul 2, 2024
1 parent f82a2aa commit c9d46d3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions osu.Framework/Graphics/Containers/ScrollContainer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ private void updateSize()

private void updatePadding()
{
if (scrollbarOverlapsContent || AvailableContent <= DisplayableContent)
if (scrollbarOverlapsContent || !Precision.DefinitelyBigger(AvailableContent, DisplayableContent, 1f))
ScrollContent.Padding = new MarginPadding();
else
{
Expand Down Expand Up @@ -568,7 +568,7 @@ protected override void UpdateAfterChildren()
float size = ScrollDirection == Direction.Horizontal ? DrawWidth : DrawHeight;
if (size > 0)
Scrollbar.ResizeTo(Math.Clamp(AvailableContent > 0 ? DisplayableContent / AvailableContent : 0, Math.Min(Scrollbar.MinimumDimSize / size, 1), 1), 200, Easing.OutQuint);
Scrollbar.FadeTo(ScrollbarVisible && AvailableContent - 1 > DisplayableContent ? 1 : 0, 200);
Scrollbar.FadeTo(ScrollbarVisible && Precision.DefinitelyBigger(AvailableContent, DisplayableContent, 1f) ? 1 : 0, 200);
updatePadding();

scrollbarCache.Validate();
Expand Down

0 comments on commit c9d46d3

Please sign in to comment.