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

Fix RoomSettingsOverlay not being updated when the rooms values are.

Browse Source
This commit is contained in:
DrabWeb 2018-06-06 05:38:43 -03:00
parent a81fc9eb5d
commit d6e3dc10e9
3 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@
using NUnit.Framework;
using osu.Framework.Graphics;
using osu.Game.Online.Multiplayer;
using osu.Game.Screens.Multi.Screens.Match;
namespace osu.Game.Tests.Visual
@ -12,9 +13,10 @@ namespace osu.Game.Tests.Visual
{
public TestCaseRoomSettings()
{
RoomSettingsOverlay overlay;
Room room = new Room();
Add(overlay = new RoomSettingsOverlay
RoomSettingsOverlay overlay;
Add(overlay = new RoomSettingsOverlay(room)
{
RelativeSizeAxes = Axes.Both,
Height = 0.75f,

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

@ -56,11 +56,10 @@ namespace osu.Game.Screens.Multi.Screens.Match
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Top = Header.HEIGHT },
Child = settings = new RoomSettingsOverlay
Child = settings = new RoomSettingsOverlay(room)
{
RelativeSizeAxes = Axes.Both,
Height = 0.9f,
Room = room,
},
},
};

49
osu.Game/Screens/Multi/Screens/Match/RoomSettingsOverlay.cs
View File

@ -2,6 +2,7 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
@ -20,31 +21,20 @@ namespace osu.Game.Screens.Multi.Screens.Match
private const float transition_duration = 500;
private const float field_padding = 45;
private readonly Bindable<string> nameBind = new Bindable<string>();
private readonly Bindable<RoomAvailability> availabilityBind = new Bindable<RoomAvailability>();
private readonly Bindable<GameType> typeBind = new Bindable<GameType>();
private readonly Bindable<int?> maxParticipantsBind = new Bindable<int?>();
private readonly Container content;
private readonly SettingsTextBox name, maxParticipants;
private readonly RoomAvailabilityPicker availability;
private readonly GameTypePicker type;
private Room room;
public Room Room
{
get => room;
set
{
if (value == room) return;
room = value;
name.Text = room.Name.Value;
maxParticipants.Text = room.MaxParticipants.Value?.ToString();
availability.Current.Value = room.Availability.Value;
type.Current.Value = room.Type.Value;
}
}
public RoomSettingsOverlay()
public RoomSettingsOverlay(Room room)
{
Masking = true;
SettingsTextBox name, maxParticipants;
RoomAvailabilityPicker availability;
GameTypePicker type;
Child = content = new Container
{
RelativeSizeAxes = Axes.Both,
@ -126,10 +116,29 @@ namespace osu.Game.Screens.Multi.Screens.Match
},
},
};
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.BindTo(room.Name);
availabilityBind.BindTo(room.Availability);
typeBind.BindTo(room.Type);
maxParticipantsBind.BindTo(room.MaxParticipants);
}
protected override void PopIn()
{
// reapply the rooms values if the overlay was completely closed
if (content.Y == -1)
{
nameBind.TriggerChange();
availabilityBind.TriggerChange();
typeBind.TriggerChange();
maxParticipantsBind.TriggerChange();
}
content.MoveToY(0, transition_duration, Easing.OutQuint);
}