mirror of
https://github.com/osukey/osukey.git
synced 2025-07-02 16:59:53 +09:00
Merge branch 'master' into osu-fontusage
This commit is contained in:
@ -4,7 +4,7 @@
|
||||
using System;
|
||||
using Humanizer;
|
||||
using osu.Framework.Allocation;
|
||||
using osu.Framework.Configuration;
|
||||
using osu.Framework.Bindables;
|
||||
using osu.Framework.Extensions.Color4Extensions;
|
||||
using osu.Framework.Graphics;
|
||||
using osu.Framework.Graphics.Containers;
|
||||
@ -264,12 +264,12 @@ namespace osu.Game.Screens.Multi.Match.Components
|
||||
processingOverlay = new ProcessingOverlay { Alpha = 0 }
|
||||
};
|
||||
|
||||
TypePicker.Current.BindValueChanged(t => typeLabel.Text = t?.Name ?? string.Empty, true);
|
||||
Name.BindValueChanged(n => NameField.Text = n, true);
|
||||
Availability.BindValueChanged(a => AvailabilityPicker.Current.Value = a, true);
|
||||
Type.BindValueChanged(t => TypePicker.Current.Value = t, true);
|
||||
MaxParticipants.BindValueChanged(m => MaxParticipantsField.Text = m?.ToString(), true);
|
||||
Duration.BindValueChanged(d => DurationField.Current.Value = d, true);
|
||||
TypePicker.Current.BindValueChanged(e => typeLabel.Text = e.NewValue?.Name ?? string.Empty, true);
|
||||
Name.BindValueChanged(e => NameField.Text = e.NewValue, true);
|
||||
Availability.BindValueChanged(e => AvailabilityPicker.Current.Value = e.NewValue, true);
|
||||
Type.BindValueChanged(e => TypePicker.Current.Value = e.NewValue, true);
|
||||
MaxParticipants.BindValueChanged(e => MaxParticipantsField.Text = e.NewValue?.ToString(), true);
|
||||
Duration.BindValueChanged(e => DurationField.Current.Value = e.NewValue, true);
|
||||
}
|
||||
|
||||
protected override void Update()
|
||||
@ -296,7 +296,7 @@ namespace osu.Game.Screens.Multi.Match.Components
|
||||
|
||||
Duration.Value = DurationField.Current.Value;
|
||||
|
||||
manager?.CreateRoom(currentRoom, onSuccess, onError);
|
||||
manager?.CreateRoom(currentRoom.Value, onSuccess, onError);
|
||||
|
||||
processingOverlay.Show();
|
||||
}
|
||||
|
Reference in New Issue
Block a user