RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-09 14:47:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

publicity -> accesstype

Browse Source
This commit is contained in:
Gabe Livengood 2022-06-23 11:40:25 -04:00
parent d67c482c48
commit 454eff43c5
No known key found for this signature in database
GPG Key ID: 70321B78DAECE683
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,11 +170,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
AddUntilStep("both rooms visible", () => container.Rooms.Count(r => r.IsPresent) == 2);
AddStep("filter public rooms", () => container.Filter.Value = new FilterCriteria { Publicity = RoomPublicityFilter.Public });
AddStep("filter public rooms", () => container.Filter.Value = new FilterCriteria { AccessType = RoomAccessType.Public });
AddUntilStep("private room hidden", () => container.Rooms.All(r => !r.Room.HasPassword.Value));
AddStep("filter private rooms", () => container.Filter.Value = new FilterCriteria { Publicity = RoomPublicityFilter.Private });
AddStep("filter private rooms", () => container.Filter.Value = new FilterCriteria { AccessType = RoomAccessType.Private });
AddUntilStep("public room hidden", () => container.Rooms.All(r => r.Room.HasPassword.Value));
}

2
osu.Game/Screens/OnlinePlay/Lounge/Components/FilterCriteria.cs
View File

@ -13,6 +13,6 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
public RoomStatusFilter Status;
public string Category;
public RulesetInfo Ruleset;
public RoomPublicityFilter Publicity;
public RoomAccessType AccessType;
}
}

2
osu.Game/Screens/OnlinePlay/Lounge/Components/RoomPublicityFilter.cs → osu.Game/Screens/OnlinePlay/Lounge/Components/RoomAccessType.cs
View File

@ -5,7 +5,7 @@
namespace osu.Game.Screens.OnlinePlay.Lounge.Components
{
public enum RoomPublicityFilter
public enum RoomAccessType
{
All,
Public,

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

@ -87,7 +87,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
matchingFilter &= r.FilterTerms.Any(term => term.ToString().Contains(criteria.SearchString, StringComparison.InvariantCultureIgnoreCase));
}
matchingFilter &= criteria.Publicity == RoomPublicityFilter.All || (criteria.Publicity == RoomPublicityFilter.Public && !r.Room.HasPassword.Value) || (criteria.Publicity == RoomPublicityFilter.Private && r.Room.HasPassword.Value);
matchingFilter &= criteria.AccessType == RoomAccessType.All || (criteria.AccessType == RoomAccessType.Public && !r.Room.HasPassword.Value) || (criteria.AccessType == RoomAccessType.Private && r.Room.HasPassword.Value);
r.MatchingFilter = matchingFilter;
}

10
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
View File

@ -31,7 +31,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
[Resolved]
private MultiplayerClient client { get; set; }
private Dropdown<RoomPublicityFilter> publicityDropdown;
private Dropdown<RoomAccessType> roomAccessTypeDropdown;
public override void OnResuming(ScreenTransitionEvent e)
{
@ -48,22 +48,22 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
protected override IEnumerable<Drawable> CreateFilterControls()
{
publicityDropdown = new SlimEnumDropdown<RoomPublicityFilter>
roomAccessTypeDropdown = new SlimEnumDropdown<RoomAccessType>
{
RelativeSizeAxes = Axes.None,
Width = 160,
};
publicityDropdown.Current.BindValueChanged(_ => UpdateFilter());
roomAccessTypeDropdown.Current.BindValueChanged(_ => UpdateFilter());
return base.CreateFilterControls().Prepend(publicityDropdown);
return base.CreateFilterControls().Prepend(roomAccessTypeDropdown);
}
protected override FilterCriteria CreateFilterCriteria()
{
var criteria = base.CreateFilterCriteria();
criteria.Category = @"realtime";
criteria.Publicity = publicityDropdown.Current.Value;
criteria.AccessType = roomAccessTypeDropdown.Current.Value;
return criteria;
}