h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-03 01:00:10 +08:00
Code Issues Releases Wiki Activity

Post-merge fixes.

Browse Source
This commit is contained in:
Dean Herbert
2016-10-09 22:21:44 +09:00
Unverified
parent 25de055802
commit cb5e4287e2
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs
+1 -1
View File
@@ -80,7 +80,7 @@ namespace osu.Desktop.Tests
ListChannelsRequest req = new ListChannelsRequest();
req.Success += delegate (List<Channel> channels)
{
Game.Scheduler.Add(delegate
Scheduler.Add(delegate
{
loading.FadeOut(100);
});
osu.Game/Overlays/ChatConsole.cs
+15 -13
View File
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays
private Container content;
protected override Container AddTarget => content;
protected override Container Content => content;
public ChatConsole()
{
@@ -44,17 +44,19 @@ namespace osu.Game.Overlays
Anchor = Anchor.BottomLeft;
Origin = Anchor.BottomLeft;
AddTopLevel(new Box
InternalChildren = new Drawable[]
{
Depth = float.MinValue,
RelativeSizeAxes = Axes.Both,
Colour = new Color4(0.1f, 0.1f, 0.1f, 0.4f)
});
AddTopLevel(content = new Container
{
RelativeSizeAxes = Axes.Both,
});
new Box
{
Depth = float.MinValue,
RelativeSizeAxes = Axes.Both,
Colour = new Color4(0.1f, 0.1f, 0.1f, 0.4f)
},
content = new Container
{
RelativeSizeAxes = Axes.Both,
}
};
}
public override void Load()
@@ -94,7 +96,7 @@ namespace osu.Game.Overlays
ListChannelsRequest req = new ListChannelsRequest();
req.Success += delegate (List<Channel> channels)
{
Game.Scheduler.Add(delegate
Scheduler.Add(delegate
{
loading.FadeOut(100);
});
@@ -103,7 +105,7 @@ namespace osu.Game.Overlays
//addChannel(channels.Find(c => c.Name == @"#lobby"));
//addChannel(channels.Find(c => c.Name == @"#english"));
messageRequest = Game.Scheduler.AddDelayed(() => FetchNewMessages(api), 1000, true);
messageRequest = Scheduler.AddDelayed(() => FetchNewMessages(api), 1000, true);
};
api.Queue(req);
}