RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix naming conflicts in RoomSettingsOverlay.

This commit is contained in:
DrabWeb 2018-08-14 11:31:20 -03:00
parent 52b157d072
commit af31845c83
2 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
osu.Game.Tests/Visual/TestCaseRoomSettings.cs
View File

@ -7,6 +7,7 @@
using osu.Game.Online.Multiplayer;
using osu.Game.Screens.Multi.Screens.Match.Settings;
using OpenTK.Input;
using osu.Framework.Testing.Input;
namespace osu.Game.Tests.Visual
{
@ -61,8 +62,7 @@ private void apply()
{
AddStep(@"apply", () =>
{
InputManager.MoveMouseTo(overlay.ApplyButton);
InputManager.Click(MouseButton.Left);
overlay.ClickApplyButton(InputManager);
});
}
@ -78,8 +78,8 @@ private class TestRoomSettingsOverlay : RoomSettingsOverlay
{
public string CurrentName
{
get => Name.Text;
set => Name.Text = value;
get => NameField.Text;
set => NameField.Text = value;
}
public int? CurrentMaxParticipants
@ -87,31 +87,35 @@ public int? CurrentMaxParticipants
get
{
int max;
if (int.TryParse(MaxParticipants.Text, out max))
if (int.TryParse(MaxParticipantsField.Text, out max))
return max;
return null;
}
set => MaxParticipants.Text = value?.ToString();
set => MaxParticipantsField.Text = value?.ToString();
}
public RoomAvailability CurrentAvailability
{
get => Availability.Current.Value;
set => Availability.Current.Value = value;
get => AvailabilityPicker.Current.Value;
set => AvailabilityPicker.Current.Value = value;
}
public GameType CurrentType
{
get => Type.Current.Value;
set => Type.Current.Value = value;
get => TypePicker.Current.Value;
set => TypePicker.Current.Value = value;
}
public TriangleButton ApplyButton => Apply;
public TestRoomSettingsOverlay(Room room) : base(room)
{
}
public void ClickApplyButton(ManualInputManager inputManager)
{
inputManager.MoveMouseTo(ApplyButton);
inputManager.Click(MouseButton.Left);
}
}
}
}

40
osu.Game/Screens/Multi/Screens/Match/Settings/RoomSettingsOverlay.cs
View File

@ -30,10 +30,10 @@ public class RoomSettingsOverlay : FocusedOverlayContainer
private readonly Container content;
private readonly OsuSpriteText typeLabel;
protected readonly OsuTextBox Name, MaxParticipants;
protected readonly RoomAvailabilityPicker Availability;
protected readonly GameTypePicker Type;
protected readonly TriangleButton Apply;
protected readonly OsuTextBox NameField, MaxParticipantsField;
protected readonly RoomAvailabilityPicker AvailabilityPicker;
protected readonly GameTypePicker TypePicker;
protected readonly TriangleButton ApplyButton;
public RoomSettingsOverlay(Room room)
{
@ -64,7 +64,7 @@ public RoomSettingsOverlay(Room room)
{
new Section("ROOM NAME")
{
Child = Name = new SettingsTextBox
Child = NameField = new SettingsTextBox
{
RelativeSizeAxes = Axes.X,
OnCommit = (sender, text) => apply(),
@ -72,7 +72,7 @@ public RoomSettingsOverlay(Room room)
},
new Section("ROOM VISIBILITY")
{
Child = Availability = new RoomAvailabilityPicker(),
Child = AvailabilityPicker = new RoomAvailabilityPicker(),
},
new Section("GAME TYPE")
{
@ -84,7 +84,7 @@ public RoomSettingsOverlay(Room room)
Spacing = new Vector2(7),
Children = new Drawable[]
{
Type = new GameTypePicker
TypePicker = new GameTypePicker
{
RelativeSizeAxes = Axes.X,
},
@ -106,7 +106,7 @@ public RoomSettingsOverlay(Room room)
{
new Section("MAX PARTICIPANTS")
{
Child = MaxParticipants = new SettingsTextBox
Child = MaxParticipantsField = new SettingsTextBox
{
RelativeSizeAxes = Axes.X,
OnCommit = (sender, text) => apply(),
@ -124,7 +124,7 @@ public RoomSettingsOverlay(Room room)
},
},
},
Apply = new ApplyButton
ApplyButton = new ApplySettingsButton
{
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
@ -135,12 +135,12 @@ public RoomSettingsOverlay(Room room)
},
};
Type.Current.ValueChanged += t => typeLabel.Text = t.Name;
TypePicker.Current.ValueChanged += t => typeLabel.Text = t.Name;
nameBind.ValueChanged += n => Name.Text = n;
availabilityBind.ValueChanged += a => Availability.Current.Value = a;
typeBind.ValueChanged += t => Type.Current.Value = t;
maxParticipantsBind.ValueChanged += m => MaxParticipants.Text = m?.ToString();
nameBind.ValueChanged += n => NameField.Text = n;
availabilityBind.ValueChanged += a => AvailabilityPicker.Current.Value = a;
typeBind.ValueChanged += t => TypePicker.Current.Value = t;
maxParticipantsBind.ValueChanged += m => MaxParticipantsField.Text = m?.ToString();
nameBind.BindTo(room.Name);
availabilityBind.BindTo(room.Availability);
@ -177,12 +177,12 @@ private void apply()
{
if (room != null)
{
room.Name.Value = Name.Text;
room.Availability.Value = Availability.Current.Value;
room.Type.Value = Type.Current.Value;
room.Name.Value = NameField.Text;
room.Availability.Value = AvailabilityPicker.Current.Value;
room.Type.Value = TypePicker.Current.Value;
int max;
if (int.TryParse(MaxParticipants.Text, out max))
if (int.TryParse(MaxParticipantsField.Text, out max))
room.MaxParticipants.Value = max;
else
room.MaxParticipants.Value = null;
@ -249,9 +249,9 @@ public Section(string title)
}
}
private class ApplyButton : TriangleButton
private class ApplySettingsButton : TriangleButton
{
public ApplyButton()
public ApplySettingsButton()
{
Text = "Apply";
}