Merge pull request #6325 from frenzibyte/fix-scrollbar-itching

Add lenience to scrollbar visibility conditionals
ppy · Jul 2, 2024 · 45cd7c7 · 45cd7c7
2 parents f82a2aa + c9d46d3
commit 45cd7c7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/osu.Framework/Graphics/Containers/ScrollContainer.cs b/osu.Framework/Graphics/Containers/ScrollContainer.cs
@@ -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
             {
@@ -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();