From 5f29b0dc4f92dd3a5b8a757c2dce99e83dbaec26 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 21 Feb 2017 15:46:04 +0900 Subject: [PATCH] Update in line with framework changes. --- osu-framework | 2 +- osu.Game/Online/Chat/Drawables/DrawableChannel.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osu-framework b/osu-framework index 1654acef1c..de1568254c 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 1654acef1ca9b9f203bfef1b507f3515b41a4d84 +Subproject commit de1568254c4c9a4ea540ccad94700c5c51f70dc2 diff --git a/osu.Game/Online/Chat/Drawables/DrawableChannel.cs b/osu.Game/Online/Chat/Drawables/DrawableChannel.cs index ef1e7ca5df..5b8d034e9d 100644 --- a/osu.Game/Online/Chat/Drawables/DrawableChannel.cs +++ b/osu.Game/Online/Chat/Drawables/DrawableChannel.cs @@ -75,7 +75,7 @@ namespace osu.Game.Online.Chat.Drawables var displayMessages = newMessages.Skip(Math.Max(0, newMessages.Count() - Channel.MAX_HISTORY)); - if (scroll.IsScrolledToEnd || !flow.Children.Any()) + if (scroll.IsScrolledToEnd(10) || !flow.Children.Any()) scrollToEnd(); //up to last Channel.MAX_HISTORY messages @@ -88,7 +88,7 @@ namespace osu.Game.Online.Chat.Drawables while (flow.Children.Count(c => c.LifetimeEnd == double.MaxValue) > Channel.MAX_HISTORY) { var d = flow.Children.First(c => c.LifetimeEnd == double.MaxValue); - if (!scroll.IsScrolledToEnd) + if (!scroll.IsScrolledToEnd(10)) scroll.OffsetScrollPosition(-d.DrawHeight); d.Expire(); }