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

Remove OnlinePlayComposite

Browse Source
This commit is contained in:
Dan Balasescu 2024-11-15 13:20:09 +09:00
parent 34c0f72dd6
commit bfbae9458a
No known key found for this signature in database
16 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
View File

@ -5,6 +5,7 @@ using System.ComponentModel;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
@ -13,7 +14,7 @@ using osu.Game.Online.Rooms;
namespace osu.Game.Screens.OnlinePlay.Components namespace osu.Game.Screens.OnlinePlay.Components
{ {
public partial class BeatmapTitle : OnlinePlayComposite public partial class BeatmapTitle : CompositeDrawable
{ {
private readonly Room room; private readonly Room room;
private readonly LinkFlowContainer textFlow; private readonly LinkFlowContainer textFlow;

2
osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
/// <summary> /// <summary>
/// A header used in the multiplayer interface which shows text / details beneath a line. /// A header used in the multiplayer interface which shows text / details beneath a line.
/// </summary> /// </summary>
public partial class OverlinedHeader : OnlinePlayComposite public partial class OverlinedHeader : CompositeDrawable
{ {
private bool showLine = true; private bool showLine = true;

2
osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs
View File

@ -11,7 +11,7 @@ using osu.Game.Online.Rooms;
namespace osu.Game.Screens.OnlinePlay.Components namespace osu.Game.Screens.OnlinePlay.Components
{ {
public partial class ParticipantCountDisplay : OnlinePlayComposite public partial class ParticipantCountDisplay : CompositeDrawable
{ {
private const float text_size = 30; private const float text_size = 30;
private const float transition_duration = 100; private const float transition_duration = 100;

3
osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
View File

@ -4,12 +4,13 @@
using System.ComponentModel; using System.ComponentModel;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Online.Rooms; using osu.Game.Online.Rooms;
namespace osu.Game.Screens.OnlinePlay.Components namespace osu.Game.Screens.OnlinePlay.Components
{ {
public partial class ParticipantsDisplay : OnlinePlayComposite public partial class ParticipantsDisplay : CompositeDrawable
{ {
public readonly Bindable<string> Details = new Bindable<string>(); public readonly Bindable<string> Details = new Bindable<string>();

2
osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
View File

@ -14,7 +14,7 @@ using osuTK;
namespace osu.Game.Screens.OnlinePlay.Components namespace osu.Game.Screens.OnlinePlay.Components
{ {
public partial class ParticipantsList : OnlinePlayComposite public partial class ParticipantsList : CompositeDrawable
{ {
public const float TILE_SIZE = 35; public const float TILE_SIZE = 35;

2
osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
View File

@ -12,7 +12,7 @@ using osu.Game.Online.Rooms;
namespace osu.Game.Screens.OnlinePlay.Components namespace osu.Game.Screens.OnlinePlay.Components
{ {
public partial class RoomLocalUserInfo : OnlinePlayComposite public partial class RoomLocalUserInfo : CompositeDrawable
{ {
private readonly Room room; private readonly Room room;
private OsuSpriteText attemptDisplay = null!; private OsuSpriteText attemptDisplay = null!;

2
osu.Game/Screens/OnlinePlay/Components/StarRatingRangeDisplay.cs
View File

@ -18,7 +18,7 @@ using Container = osu.Framework.Graphics.Containers.Container;
namespace osu.Game.Screens.OnlinePlay.Components namespace osu.Game.Screens.OnlinePlay.Components
{ {
public partial class StarRatingRangeDisplay : OnlinePlayComposite public partial class StarRatingRangeDisplay : CompositeDrawable
{ {
private readonly Room room; private readonly Room room;

2
osu.Game/Screens/OnlinePlay/DailyChallenge/DailyChallengeTimeRemainingRing.cs
View File

@ -17,7 +17,7 @@ using osuTK;
namespace osu.Game.Screens.OnlinePlay.DailyChallenge namespace osu.Game.Screens.OnlinePlay.DailyChallenge
{ {
public partial class DailyChallengeTimeRemainingRing : OnlinePlayComposite public partial class DailyChallengeTimeRemainingRing : CompositeDrawable
{ {
private readonly Room room; private readonly Room room;

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

@ -346,7 +346,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
if (Room.Type != MatchType.Playlists) if (Room.Type != MatchType.Playlists)
{ {
pills.AddRange(new OnlinePlayComposite[] pills.AddRange(new Drawable[]
{ {
new MatchTypePill(Room), new MatchTypePill(Room),
new QueueModePill(Room), new QueueModePill(Room),
@ -377,7 +377,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
Room.PropertyChanged -= onRoomPropertyChanged; Room.PropertyChanged -= onRoomPropertyChanged;
} }
private partial class RoomStatusText : OnlinePlayComposite private partial class RoomStatusText : CompositeDrawable
{ {
public readonly IBindable<PlaylistItem?> SelectedItem = new Bindable<PlaylistItem?>(); public readonly IBindable<PlaylistItem?> SelectedItem = new Bindable<PlaylistItem?>();

2
osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoomParticipantsList.cs
View File

@ -21,7 +21,7 @@ using Container = osu.Framework.Graphics.Containers.Container;
namespace osu.Game.Screens.OnlinePlay.Lounge.Components namespace osu.Game.Screens.OnlinePlay.Lounge.Components
{ {
public partial class DrawableRoomParticipantsList : OnlinePlayComposite public partial class DrawableRoomParticipantsList : CompositeDrawable
{ {
public const float SHEAR_WIDTH = 12f; public const float SHEAR_WIDTH = 12f;
private const float avatar_size = 36; private const float avatar_size = 36;

3
osu.Game/Screens/OnlinePlay/Lounge/Components/EndDateInfo.cs
View File

@ -5,12 +5,13 @@ using System;
using System.ComponentModel; using System.ComponentModel;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Online.Rooms; using osu.Game.Online.Rooms;
namespace osu.Game.Screens.OnlinePlay.Lounge.Components namespace osu.Game.Screens.OnlinePlay.Lounge.Components
{ {
public partial class EndDateInfo : OnlinePlayComposite public partial class EndDateInfo : CompositeDrawable
{ {
private readonly Room room; private readonly Room room;

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

@ -3,13 +3,14 @@
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
namespace osu.Game.Screens.OnlinePlay.Lounge.Components namespace osu.Game.Screens.OnlinePlay.Lounge.Components
{ {
public abstract partial class OnlinePlayPill : OnlinePlayComposite public abstract partial class OnlinePlayPill : CompositeDrawable
{ {
protected PillContainer Pill { get; private set; } = null!; protected PillContainer Pill { get; private set; } = null!;
protected OsuTextFlowContainer TextFlow { get; private set; } = null!; protected OsuTextFlowContainer TextFlow { get; private set; } = null!;

4
osu.Game/Screens/OnlinePlay/Match/Components/RoomSettingsOverlay.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
protected const float TRANSITION_DURATION = 350; protected const float TRANSITION_DURATION = 350;
protected const float FIELD_PADDING = 25; protected const float FIELD_PADDING = 25;
protected OnlinePlayComposite Settings { get; set; } = null!; protected Drawable Settings { get; set; } = null!;
protected override bool BlockScrollInput => false; protected override bool BlockScrollInput => false;
@ -48,7 +48,7 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
protected abstract void SelectBeatmap(); protected abstract void SelectBeatmap();
protected abstract OnlinePlayComposite CreateSettings(Room room); protected abstract Drawable CreateSettings(Room room);
protected override void PopIn() protected override void PopIn()
{ {

4
osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
View File

@ -51,7 +51,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
protected override void SelectBeatmap() => settings.SelectBeatmap(); protected override void SelectBeatmap() => settings.SelectBeatmap();
protected override OnlinePlayComposite CreateSettings(Room room) => settings = new MatchSettings(room) protected override Drawable CreateSettings(Room room) => settings = new MatchSettings(room)
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
RelativePositionAxes = Axes.Y, RelativePositionAxes = Axes.Y,
@ -59,7 +59,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
SelectedItem = { BindTarget = SelectedItem } SelectedItem = { BindTarget = SelectedItem }
}; };
protected partial class MatchSettings : OnlinePlayComposite protected partial class MatchSettings : CompositeDrawable
{ {
private const float disabled_alpha = 0.2f; private const float disabled_alpha = 0.2f;

13
osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
View File

@ -1,13 +0,0 @@
// 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 osu.Framework.Graphics.Containers;
using osu.Game.Online.Rooms;
namespace osu.Game.Screens.OnlinePlay
{
/// <summary>
/// A <see cref="CompositeDrawable"/> that exposes bindables for <see cref="Room"/> properties.
/// </summary>
public partial class OnlinePlayComposite : CompositeDrawable;
}

4
osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
View File

@ -47,14 +47,14 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
protected override void SelectBeatmap() => settings.SelectBeatmap(); protected override void SelectBeatmap() => settings.SelectBeatmap();
protected override OnlinePlayComposite CreateSettings(Room room) => settings = new MatchSettings(room) protected override Drawable CreateSettings(Room room) => settings = new MatchSettings(room)
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
RelativePositionAxes = Axes.Y, RelativePositionAxes = Axes.Y,
EditPlaylist = () => EditPlaylist?.Invoke() EditPlaylist = () => EditPlaylist?.Invoke()
}; };
protected partial class MatchSettings : OnlinePlayComposite protected partial class MatchSettings : CompositeDrawable
{ {
private const float disabled_alpha = 0.2f; private const float disabled_alpha = 0.2f;