sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 23:24:04 +09:00
Code Issues Packages Projects 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
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

Submodule osu-framework updated: 1654acef1c...de1568254c

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();
} }