Merge remote-tracking branch 'upstream/master' into Private_Messages

This commit is contained in:
Dean Herbert
2018-11-12 20:41:10 +09:00
410 changed files with 6673 additions and 3295 deletions

View File

@ -9,7 +9,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.UserInterface;
using osu.Framework.Input.States;
using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.Chat;
@ -122,7 +122,7 @@ namespace osu.Game.Overlays.Chat.Tabs
protected virtual bool ShowCloseOnHover => true;
protected override bool OnHover(InputState state)
protected override bool OnHover(HoverEvent e)
{
if (IsRemovable && ShowCloseOnHover)
CloseButton.FadeIn(200, Easing.OutQuint);
@ -132,7 +132,7 @@ namespace osu.Game.Overlays.Chat.Tabs
return true;
}
protected override void OnHoverLost(InputState state)
protected override void OnHoverLost(HoverLostEvent e)
{
CloseButton.FadeOut(200, Easing.OutQuint);
updateState();