RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tournament-base-changes' into tournament-design-gameplay

This commit is contained in:
Dean Herbert 2020-03-08 18:12:10 +09:00
parent 8e4b15aaa5 0102aaf32a
commit 0019199082
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
View File

@ -65,6 +65,10 @@ private void load(MatchIPCInfo ipc)
} }
} }
public void Expand() => this.FadeIn(300);
public void Contract() => this.FadeOut(200);
protected override ChatLine CreateMessage(Message message) => new MatchMessage(message); protected override ChatLine CreateMessage(Message message) => new MatchMessage(message);
protected class MatchMessage : StandAloneMessage protected class MatchMessage : StandAloneMessage

12
osu.Game/Online/Chat/StandAloneChatDisplay.cs
View File

@ -92,18 +92,6 @@ private void postMessage(TextBox sender, bool newtext)
textbox.Text = string.Empty; textbox.Text = string.Empty;
} }
public void Expand()
{
this.FadeIn(300);
this.MoveToY(0, 500, Easing.OutQuint);
}
public void Contract()
{
this.FadeOut(200);
this.MoveToY(100, 500, Easing.In);
}
protected virtual ChatLine CreateMessage(Message message) => new StandAloneMessage(message); protected virtual ChatLine CreateMessage(Message message) => new StandAloneMessage(message);
private void channelChanged(ValueChangedEvent<Channel> e) private void channelChanged(ValueChangedEvent<Channel> e)