sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-04-29 10:47:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix naming & namespaces

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs
View File

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

8
osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
View File

@ -12,8 +12,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
{ {
public partial class OnlinePlayPill : OnlinePlayComposite public partial class OnlinePlayPill : OnlinePlayComposite
{ {
protected PillContainer pill; protected PillContainer Pill;
protected OsuTextFlowContainer textFlow; protected OsuTextFlowContainer TextFlow;
public OnlinePlayPill() public OnlinePlayPill()
{ {
@ -23,9 +23,9 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() 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, AutoSizeAxes = Axes.Both,
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,

8
osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistCountPill.cs
View File

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

4
osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs
View File

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

10
osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
View File

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

8
osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
View File

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