sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 07:33:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add error message when creation fails

Browse Source
This commit is contained in:
smoogipoo
2018-12-26 18:38:58 +09:00
parent 9901b11600
commit 940d4a16bb
7 changed files with 109 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Screens/Multi/IRoomManager.cs
View File

@ -24,7 +24,8 @@ namespace osu.Game.Screens.Multi
/// Creates a new <see cref="Room"/>.
/// </summary>
/// <param name="room">The <see cref="Room"/> to create.</param>
void CreateRoom(Room room);
/// <param name="onError">An action to be invoked if an error occurred.</param>
void CreateRoom(Room room, Action<string> onError = null);
/// <summary>
/// Joins a <see cref="Room"/>.

44
osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
View File

@ -37,6 +37,8 @@ namespace osu.Game.Screens.Multi.Match.Components
protected readonly TriangleButton ApplyButton;
protected readonly OsuPasswordTextBox PasswordField;
protected readonly OsuSpriteText ErrorText;
private readonly Room room;
[Resolved(CanBeNull = true)]
@ -200,14 +202,31 @@ namespace osu.Game.Screens.Multi.Match.Components
RelativeSizeAxes = Axes.Both,
Colour = OsuColour.FromHex(@"28242d").Darken(0.5f).Opacity(1f),
},
ApplyButton = new CreateRoomButton
new FillFlowContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical,
Spacing = new Vector2(0, 20),
Margin = new MarginPadding { Vertical = 20 },
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(230, 55),
Action = apply,
},
Children = new Drawable[]
{
ApplyButton = new CreateRoomButton
{
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
Size = new Vector2(230, 55),
Action = apply,
},
ErrorText = new OsuSpriteText
{
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
Alpha = 0,
Depth = 1
}
}
}
}
}
}
@ -229,6 +248,7 @@ namespace osu.Game.Screens.Multi.Match.Components
private void load(OsuColour colours)
{
typeLabel.Colour = colours.Yellow;
ErrorText.Colour = colours.RedDark;
MaxParticipantsField.ReadOnly = true;
PasswordField.ReadOnly = true;
@ -258,6 +278,8 @@ namespace osu.Game.Screens.Multi.Match.Components
private void apply()
{
hideError();
bindings.Name.Value = NameField.Text;
bindings.Availability.Value = AvailabilityPicker.Current.Value;
bindings.Type.Value = TypePicker.Current.Value;
@ -269,7 +291,15 @@ namespace osu.Game.Screens.Multi.Match.Components
bindings.Duration.Value = DurationField.Current.Value;
manager?.CreateRoom(room);
manager?.CreateRoom(room, showError);
}
private void hideError() => ErrorText.FadeOut(50);
private void showError(string text)
{
ErrorText.Text = text;
ErrorText.FadeIn(50);
}
private class SettingsTextBox : OsuTextBox

10
osu.Game/Screens/Multi/RoomManager.cs
View File

@ -48,13 +48,19 @@ namespace osu.Game.Screens.Multi
PartRoom();
}
public void CreateRoom(Room room)
public void CreateRoom(Room room, Action<string> onError = null)
{
room.Host.Value = api.LocalUser;
var req = new CreateRoomRequest(room);
req.Success += result => addRoom(room, result);
req.Failure += exception => Logger.Log($"Failed to create room: {exception}");
req.Failure += exception =>
{
if (req.Result != null)
onError?.Invoke(req.Result.Error);
else
Logger.Log($"Failed to create the room: {exception}", level: LogLevel.Important);
};
api.Queue(req);
}