1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 19:52:55 +08:00

Fix naming & namespaces

This commit is contained in:
timiimit 2023-05-16 10:06:48 +02:00
parent 04893064f0
commit 40daa41a52
6 changed files with 21 additions and 25 deletions

View File

@ -3,12 +3,8 @@
#nullable disable
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Extensions;
using osu.Framework.Graphics;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Online.Rooms;
namespace osu.Game.Screens.OnlinePlay.Lounge.Components
@ -24,8 +20,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
private void onMatchTypeChanged(ValueChangedEvent<MatchType> type)
{
textFlow.Clear();
textFlow.AddText(type.NewValue.GetLocalisableDescription());
TextFlow.Clear();
TextFlow.AddText(type.NewValue.GetLocalisableDescription());
}
}
}

View File

@ -12,8 +12,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
{
public partial class OnlinePlayPill : OnlinePlayComposite
{
protected PillContainer pill;
protected OsuTextFlowContainer textFlow;
protected PillContainer Pill;
protected OsuTextFlowContainer TextFlow;
public OnlinePlayPill()
{
@ -23,9 +23,9 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
[BackgroundDependencyLoader]
private void load()
{
InternalChild = pill = new PillContainer
InternalChild = Pill = new PillContainer
{
Child = textFlow = new OsuTextFlowContainer(s => s.Font = OsuFont.GetFont(size: 12))
Child = TextFlow = new OsuTextFlowContainer(s => s.Font = OsuFont.GetFont(size: 12))
{
AutoSizeAxes = Axes.Both,
Anchor = Anchor.CentreLeft,

View File

@ -32,10 +32,10 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
? Playlist.Count(i => !i.Expired)
: PlaylistItemStats.Value.CountActive;
textFlow.Clear();
textFlow.AddText(activeItems.ToLocalisableString(), s => s.Font = s.Font.With(weight: FontWeight.Bold));
textFlow.AddText(" ");
textFlow.AddText("Beatmap".ToQuantity(activeItems, ShowQuantityAs.None));
TextFlow.Clear();
TextFlow.AddText(activeItems.ToLocalisableString(), s => s.Font = s.Font.With(weight: FontWeight.Bold));
TextFlow.AddText(" ");
TextFlow.AddText("Beatmap".ToQuantity(activeItems, ShowQuantityAs.None));
}
}
}

View File

@ -20,8 +20,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
private void onQueueModeChanged(ValueChangedEvent<QueueMode> mode)
{
textFlow.Clear();
textFlow.AddText(mode.NewValue.GetLocalisableDescription());
TextFlow.Clear();
TextFlow.AddText(mode.NewValue.GetLocalisableDescription());
}
}
}

View File

@ -18,17 +18,17 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
{
base.LoadComplete();
pill.Background.Colour = colours.Pink;
pill.Background.Alpha = 1;
Pill.Background.Colour = colours.Pink;
Pill.Background.Alpha = 1;
Category.BindValueChanged(c =>
{
textFlow.Clear();
textFlow.AddText(c.NewValue.GetLocalisableDescription());
TextFlow.Clear();
TextFlow.AddText(c.NewValue.GetLocalisableDescription());
var backgroundColour = colours.ForRoomCategory(Category.Value);
if (backgroundColour != null)
pill.Background.Colour = backgroundColour.Value;
Pill.Background.Colour = backgroundColour.Value;
}, true);
}
}

View File

@ -34,11 +34,11 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
{
RoomStatus status = getDisplayStatus();
pill.Background.Alpha = 1;
pill.Background.FadeColour(status.GetAppropriateColour(colours), 100);
Pill.Background.Alpha = 1;
Pill.Background.FadeColour(status.GetAppropriateColour(colours), 100);
textFlow.Clear();
textFlow.AddText(status.Message);
TextFlow.Clear();
TextFlow.AddText(status.Message);
}
private RoomStatus getDisplayStatus()