sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 07:06:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ppy/osu into linkify-metadata

Browse Source
This commit is contained in:
unknown
2020-03-18 14:18:53 +08:00
parent 2952fc8cc4 8358e1df24
commit 2340142dc1
833 changed files with 23519 additions and 11624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Online/Chat/ChannelManager.cs
View File

@ -48,7 +48,8 @@ namespace osu.Game.Online.Chat
/// </summary>
public IBindableList<Channel> AvailableChannels => availableChannels;
private IAPIProvider api;
[Resolved]
private IAPIProvider api { get; set; }
public readonly BindableBool HighPollRate = new BindableBool();
@ -466,12 +467,6 @@ namespace osu.Game.Online.Chat
api.Queue(req);
}
[BackgroundDependencyLoader]
private void load(IAPIProvider api)
{
this.api = api;
}
}
/// <summary>

1
osu.Game/Online/Chat/ChannelType.cs
View File

@ -12,5 +12,6 @@ namespace osu.Game.Online.Chat
Temporary,
PM,
Group,
System,
}
}

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

@ -13,15 +13,17 @@ namespace osu.Game.Online.Chat
{
public class ExternalLinkOpener : Component
{
private GameHost host;
private DialogOverlay dialogOverlay;
[Resolved]
private GameHost host { get; set; }
[Resolved(CanBeNull = true)]
private DialogOverlay dialogOverlay { get; set; }
private Bindable<bool> externalLinkWarning;
[BackgroundDependencyLoader(true)]
private void load(GameHost host, DialogOverlay dialogOverlay, OsuConfigManager config)
private void load(OsuConfigManager config)
{
this.host = host;
this.dialogOverlay = dialogOverlay;
externalLinkWarning = config.GetBindable<bool>(OsuSetting.ExternalLinkWarning);
}

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

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