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

RoomSettingsOverlay -> MatchSettingOverlay

Browse Source
This commit is contained in:
Dean Herbert 2018-12-26 16:11:40 +09:00
parent a8d0ff67a9
commit 9b2575cc20
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual
{
public override IReadOnlyList<Type> RequiredTypes => new[]
{
typeof(RoomSettingsOverlay)
typeof(MatchSettingsOverlay)
};
[Cached(Type = typeof(IRoomManager))]
@ -85,7 +85,7 @@ namespace osu.Game.Tests.Visual
AddAssert("has correct duration", () => createdRoom.Duration.Value == expectedDuration);
}
private class TestRoomSettings : RoomSettingsOverlay
private class TestRoomSettings : MatchSettingsOverlay
{
public new TriangleButton ApplyButton => base.ApplyButton;

2
osu.Game/Online/Multiplayer/Room.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Online.Multiplayer
public Bindable<int?> RoomID { get; private set; } = new Bindable<int?>();
[JsonProperty("name")]
public Bindable<string> Name { get; private set; } = new Bindable<string>("My awesome room!");
public Bindable<string> Name { get; private set; } = new Bindable<string>();
[JsonProperty("host")]
public Bindable<User> Host { get; private set; } = new Bindable<User>();

4
osu.Game/Screens/Multi/Match/Components/Header.cs
View File

@ -94,11 +94,11 @@ namespace osu.Game.Screens.Multi.Match.Components
Origin = Anchor.TopRight,
RelativeSizeAxes = Axes.Y,
Width = 200,
Padding = new MarginPadding { Vertical = 5 },
Padding = new MarginPadding { Vertical = 10 },
Child = beatmapButton = new BeatmapSelectButton(room)
{
RelativeSizeAxes = Axes.Both,
Height = 1
Height = 1,
},
},
Tabs = new MatchTabControl(room)

4
osu.Game/Screens/Multi/Match/Components/RoomSettingsOverlay.cs → osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
View File

@ -18,7 +18,7 @@ using osuTK.Graphics;
namespace osu.Game.Screens.Multi.Match.Components
{
public class RoomSettingsOverlay : FocusedOverlayContainer
public class MatchSettingsOverlay : FocusedOverlayContainer
{
private const float transition_duration = 350;
private const float field_padding = 45;
@ -42,7 +42,7 @@ namespace osu.Game.Screens.Multi.Match.Components
[Resolved(CanBeNull = true)]
private IRoomManager manager { get; set; }
public RoomSettingsOverlay(Room room)
public MatchSettingsOverlay(Room room)
{
this.room = room;

4
osu.Game/Screens/Multi/Match/MatchScreen.cs
View File

@ -52,7 +52,7 @@ namespace osu.Game.Screens.Multi.Match
MatchChatDisplay chat;
Components.Header header;
RoomSettingsOverlay settings;
MatchSettingsOverlay settings;
Children = new Drawable[]
{
@ -90,7 +90,7 @@ namespace osu.Game.Screens.Multi.Match
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Top = Components.Header.HEIGHT },
Child = settings = new RoomSettingsOverlay(room) { RelativeSizeAxes = Axes.Both },
Child = settings = new MatchSettingsOverlay(room) { RelativeSizeAxes = Axes.Both },
},
};