From c9d46d3a6036e403bd92874b642c48dae3629a57 Mon Sep 17 00:00:00 2001 From: Salman Ahmed Date: Tue, 2 Jul 2024 13:39:42 +0300 Subject: [PATCH] Add lenience to scrollbar visibility conditionals --- osu.Framework/Graphics/Containers/ScrollContainer.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Framework/Graphics/Containers/ScrollContainer.cs b/osu.Framework/Graphics/Containers/ScrollContainer.cs index 3a53d51e58..eae4c968ee 100644 --- 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();