h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-05 16:43:04 +08:00
Code Issues Releases Wiki Activity

Update in line with framework changes.

Browse Source
This commit is contained in:
Dean Herbert 2017-02-21 15:46:04 +09:00
parent 6a83620589
commit 5f29b0dc4f
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 1654acef1ca9b9f203bfef1b507f3515b41a4d84 Subproject commit de1568254c4c9a4ea540ccad94700c5c51f70dc2

4
osu.Game/Online/Chat/Drawables/DrawableChannel.cs
View File

@ -75,7 +75,7 @@ namespace osu.Game.Online.Chat.Drawables
var displayMessages = newMessages.Skip(Math.Max(0, newMessages.Count() - Channel.MAX_HISTORY)); 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(); scrollToEnd();
//up to last Channel.MAX_HISTORY messages //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) while (flow.Children.Count(c => c.LifetimeEnd == double.MaxValue) > Channel.MAX_HISTORY)
{ {
var d = flow.Children.First(c => c.LifetimeEnd == double.MaxValue); var d = flow.Children.First(c => c.LifetimeEnd == double.MaxValue);
if (!scroll.IsScrolledToEnd) if (!scroll.IsScrolledToEnd(10))
scroll.OffsetScrollPosition(-d.DrawHeight); scroll.OffsetScrollPosition(-d.DrawHeight);
d.Expire(); d.Expire();
} }