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

Remove ShadowModel requirement

Browse Source
This commit is contained in:
smoogipoo 2019-02-06 13:52:48 +09:00
parent 594dffba41
commit a9aa22c97b
2 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Screens/Multi/Components/ParticipantCount.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;

49
osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using osu.Framework;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -92,12 +93,13 @@ namespace osu.Game.Screens.Multi.Lounge.Components
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
Box sideStrip;
OsuSpriteText name;
Children = new Drawable[]
{
selectionBox,
new StatusColouredContainer
{
RelativeSizeAxes = Axes.Both,
Child = selectionBox
},
new Container
{
RelativeSizeAxes = Axes.Both,
@ -120,10 +122,11 @@ namespace osu.Game.Screens.Multi.Lounge.Components
RelativeSizeAxes = Axes.Both,
Colour = OsuColour.FromHex(@"212121"),
},
sideStrip = new Box
new StatusColouredContainer
{
RelativeSizeAxes = Axes.Y,
Width = side_strip_width,
Child = new Box { RelativeSizeAxes = Axes.Both }
},
new Container
{
@ -152,9 +155,10 @@ namespace osu.Game.Screens.Multi.Lounge.Components
Spacing = new Vector2(5f),
Children = new Drawable[]
{
name = new OsuSpriteText
new StatusColouredContainer
{
TextSize = 18
AutoSizeAxes = Axes.Both,
Child = new RoomName { TextSize = 18 }
},
new ParticipantInfo(),
},
@ -184,13 +188,6 @@ namespace osu.Game.Screens.Multi.Lounge.Components
},
},
};
dependencies.ShadowModel.Name.BindValueChanged(n => name.Text = n, true);
dependencies.ShadowModel.Status.BindValueChanged(s =>
{
foreach (Drawable d in new Drawable[] { selectionBox, sideStrip })
d.FadeColour(s.GetAppropriateColour(colours), transition_duration);
}, true);
}
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
@ -205,5 +202,29 @@ namespace osu.Game.Screens.Multi.Lounge.Components
base.LoadComplete();
this.FadeInFromZero(transition_duration);
}
private class RoomName : OsuSpriteText
{
[Resolved(typeof(Room), nameof(Online.Multiplayer.Room.Name))]
private Bindable<string> name { get; set; }
[BackgroundDependencyLoader]
private void load()
{
Current = name;
}
}
private class StatusColouredContainer : Container
{
[Resolved(typeof(Room), nameof(Online.Multiplayer.Room.Status))]
private Bindable<RoomStatus> status { get; set; }
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
status.BindValueChanged(s => this.FadeColour(s.GetAppropriateColour(colours), transition_duration), true);
}
}
}
}