h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 21:42:55 +08:00
Code Issues Releases Wiki Activity

Update ParticipantInfo

Browse Source
This commit is contained in:
Dean Herbert 2018-12-26 20:31:04 +09:00
parent 5bd3ab51dd
commit 8386e206c3
2 changed files with 11 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
osu.Game/Screens/Multi/Lounge/Components/ParticipantInfo.cs
View File

@ -2,12 +2,10 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Configuration; using osu.Framework.Configuration;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
@ -19,12 +17,12 @@ namespace osu.Game.Screens.Multi.Lounge.Components
{ {
public class ParticipantInfo : Container public class ParticipantInfo : Container
{ {
private readonly FillFlowContainer levelRangeContainer; private readonly FillFlowContainer summaryContainer;
public readonly IBindable<User> Host = new Bindable<User>(); public readonly IBindable<User> Host = new Bindable<User>();
public readonly IBindable<IEnumerable<User>> Participants = new Bindable<IEnumerable<User>>(); public readonly IBindable<IEnumerable<User>> Participants = new Bindable<IEnumerable<User>>();
public ParticipantInfo(string rankPrefix = null) public ParticipantInfo()
{ {
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
Height = 15f; Height = 15f;
@ -49,7 +47,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
Width = 22f, Width = 22f,
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
}, },
new Container //todo: team banners /*new Container //todo: team banners
{ {
Width = 38f, Width = 38f,
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
@ -63,7 +61,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
Colour = OsuColour.FromHex(@"ad387e"), Colour = OsuColour.FromHex(@"ad387e"),
}, },
}, },
}, },*/
hostText = new LinkFlowContainer hostText = new LinkFlowContainer
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
@ -72,7 +70,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
} }
}, },
}, },
levelRangeContainer = new FillFlowContainer summaryContainer = new FillFlowContainer
{ {
Anchor = Anchor.CentreRight, Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight, Origin = Anchor.CentreRight,
@ -82,34 +80,9 @@ namespace osu.Game.Screens.Multi.Lounge.Components
{ {
new OsuSpriteText new OsuSpriteText
{ {
Text = rankPrefix, Text = "0 participants",
TextSize = 14, TextSize = 14,
}, }
new OsuSpriteText
{
Text = "#",
TextSize = 14,
},
levelRangeLower = new OsuSpriteText
{
TextSize = 14,
Font = @"Exo2.0-Bold",
},
new OsuSpriteText
{
Text = " - ",
TextSize = 14,
},
new OsuSpriteText
{
Text = "#",
TextSize = 14,
},
levelRangeHigher = new OsuSpriteText
{
TextSize = 14,
Font = @"Exo2.0-Bold",
},
}, },
}, },
}; };
@ -123,18 +96,18 @@ namespace osu.Game.Screens.Multi.Lounge.Components
flagContainer.Child = new DrawableFlag(v.Country) { RelativeSizeAxes = Axes.Both }; flagContainer.Child = new DrawableFlag(v.Country) { RelativeSizeAxes = Axes.Both };
}); });
Participants.BindValueChanged(v => /*Participants.BindValueChanged(v =>
{ {
var ranks = v.Select(u => u.Statistics.Ranks.Global); var ranks = v.Select(u => u.Statistics.Ranks.Global);
levelRangeLower.Text = ranks.Min().ToString(); levelRangeLower.Text = ranks.Min().ToString();
levelRangeHigher.Text = ranks.Max().ToString(); levelRangeHigher.Text = ranks.Max().ToString();
}); });*/
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
levelRangeContainer.Colour = colours.Gray9; summaryContainer.Colour = colours.Gray9;
} }
} }
} }

2
osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
View File

@ -142,7 +142,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
Padding = contentPadding, Padding = contentPadding,
Children = new Drawable[] Children = new Drawable[]
{ {
participantInfo = new ParticipantInfo(@"Rank Range "), participantInfo = new ParticipantInfo(),
}, },
}, },
}, },