sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 16:59:53 +09:00
Code Issues Packages Projects Releases Wiki Activity

Basic channel joining (ignore layout in ChatOverlay, temporary)

Browse Source
This commit is contained in:
DrabWeb
2017-05-20 21:26:39 -03:00
parent 4a166c1949
commit a60d1efc21
5 changed files with 63 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Game/Overlays/ChatOverlay.cs
View File

@ -53,6 +53,10 @@ namespace osu.Game.Overlays
private Bindable<double> chatHeight;
private readonly ChannelSelectionOverlay channelSelection;
protected override bool InternalContains(Vector2 screenSpacePos) => base.InternalContains(screenSpacePos) || channelSelection.Contains(screenSpacePos);
public ChatOverlay()
{
RelativeSizeAxes = Axes.Both;
@ -65,6 +69,12 @@ namespace osu.Game.Overlays
Children = new Drawable[]
{
channelSelection = new ChannelSelectionOverlay
{
Origin = Anchor.BottomLeft,
Height = 400,
State = Visibility.Visible,
},
new Container
{
Name = @"chat area",
@ -233,6 +243,16 @@ namespace osu.Game.Overlays
addChannel(channels.Find(c => c.Name == @"#lazer"));
addChannel(channels.Find(c => c.Name == @"#osu"));
addChannel(channels.Find(c => c.Name == @"#lobby"));
channelSelection.OnRequestJoin = channel => addChannel(channel);
channelSelection.Sections = new[]
{
new ChannelSection
{
Header = @"ALL CHANNELS",
Channels = channels,
},
};
});
messageRequest = Scheduler.AddDelayed(fetchNewMessages, 1000, true);
@ -294,6 +314,8 @@ namespace osu.Game.Overlays
if (CurrentChannel == null)
CurrentChannel = channel;
channel.Joined.Value = true;
}
private void fetchInitialMessages(Channel channel)