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

Merge pull request #14018 from peppy/fix-keyboard-navigation-room-container

Browse Source 
Fix keyboard navigation at multiplayer lounge not iterating in correct order
This commit is contained in:
Dan Balasescu 2021-07-26 14:55:40 +09:00 committed by GitHub
commit 5e2222cc05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
View File

@ -4,6 +4,8 @@
using System.Linq;
using NUnit.Framework;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Testing;
using osu.Game.Online.Rooms;
using osu.Game.Rulesets.Catch;
using osu.Game.Rulesets.Osu;
@ -62,6 +64,31 @@ namespace osu.Game.Tests.Visual.Multiplayer
AddAssert("last room selected", () => checkRoomSelected(RoomManager.Rooms.Last()));
}
[Test]
public void TestKeyboardNavigationAfterOrderChange()
{
AddStep("add rooms", () => RoomManager.AddRooms(3));
AddStep("reorder rooms", () =>
{
var room = RoomManager.Rooms[1];
RoomManager.RemoveRoom(room);
RoomManager.AddRoom(room);
});
AddAssert("no selection", () => checkRoomSelected(null));
press(Key.Down);
AddAssert("first room selected", () => checkRoomSelected(getRoomInFlow(0)));
press(Key.Down);
AddAssert("second room selected", () => checkRoomSelected(getRoomInFlow(1)));
press(Key.Down);
AddAssert("third room selected", () => checkRoomSelected(getRoomInFlow(2)));
}
[Test]
public void TestClickDeselection()
{
@ -121,5 +148,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
}
private bool checkRoomSelected(Room room) => SelectedRoom.Value == room;
private Room getRoomInFlow(int index) =>
(container.ChildrenOfType<FillFlowContainer<DrawableRoom>>().First().FlowingChildren.ElementAt(index) as DrawableRoom)?.Room;
}
}

3
osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
View File

@ -27,7 +27,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
private readonly IBindableList<Room> rooms = new BindableList<Room>();
private readonly FillFlowContainer<DrawableRoom> roomFlow;
public IReadOnlyList<DrawableRoom> Rooms => roomFlow;
public IReadOnlyList<DrawableRoom> Rooms => roomFlow.FlowingChildren.Cast<DrawableRoom>().ToArray();
[Resolved(CanBeNull = true)]
private Bindable<FilterCriteria> filter { get; set; }

22
osu.Game/Tests/Visual/OnlinePlay/BasicTestRoomManager.cs
View File

@ -18,11 +18,7 @@ namespace osu.Game.Tests.Visual.OnlinePlay
/// </summary>
public class BasicTestRoomManager : IRoomManager
{
public event Action RoomsUpdated
{
add { }
remove { }
}
public event Action RoomsUpdated;
public readonly BindableList<Room> Rooms = new BindableList<Room>();
@ -35,8 +31,21 @@ namespace osu.Game.Tests.Visual.OnlinePlay
public void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
{
room.RoomID.Value ??= Rooms.Select(r => r.RoomID.Value).Where(id => id != null).Select(id => id.Value).DefaultIfEmpty().Max() + 1;
Rooms.Add(room);
onSuccess?.Invoke(room);
AddRoom(room);
}
public void AddRoom(Room room)
{
Rooms.Add(room);
RoomsUpdated?.Invoke();
}
public void RemoveRoom(Room room)
{
Rooms.Remove(room);
RoomsUpdated?.Invoke();
}
public void JoinRoom(Room room, string password, Action<Room> onSuccess = null, Action<string> onError = null)
@ -56,6 +65,7 @@ namespace osu.Game.Tests.Visual.OnlinePlay
var room = new Room
{
RoomID = { Value = i },
Position = { Value = i },
Name = { Value = $"Room {i}" },
Host = { Value = new User { Username = "Host" } },
EndDate = { Value = DateTimeOffset.Now + TimeSpan.FromSeconds(10) },