Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remember multiplayer room filter mode #26538

Merged
merged 1 commit into from Jan 15, 2024
Merged

Remember multiplayer room filter mode #26538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions osu.Game/Configuration/OsuConfigManager.cs
View file
Open in desktop
Expand Up @@ -17,6 +17,7 @@
using osu.Game.Overlays;
using osu.Game.Overlays.Mods.Input;
using osu.Game.Rulesets.Scoring;
using osu.Game.Screens.OnlinePlay.Lounge.Components;
using osu.Game.Screens.Select;
using osu.Game.Screens.Select.Filter;
using osu.Game.Skinning;
Expand Down Expand Up @@ -191,6 +192,8 @@ protected override void InitialiseDefaults()
SetDefault(OsuSetting.EditorLimitedDistanceSnap, false);
SetDefault(OsuSetting.EditorShowSpeedChanges, false);

SetDefault(OsuSetting.MultiplayerRoomFilter, RoomPermissionsFilter.All);

SetDefault(OsuSetting.LastProcessedMetadataId, -1);

SetDefault(OsuSetting.ComboColourNormalisationAmount, 0.2f, 0f, 1f, 0.01f);
Expand Down Expand Up @@ -423,5 +426,6 @@ public enum OsuSetting
TouchDisableGameplayTaps,
ModSelectTextSearchStartsActive,
UserOnlineStatus,
MultiplayerRoomFilter
}
}
6 changes: 5 additions & 1 deletion osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@
#nullable disable

using System;
using System.Diagnostics;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using JetBrains.Annotations;
using osu.Framework.Allocation;
Expand All @@ -19,6 +19,7 @@
using osu.Framework.Logging;
using osu.Framework.Screens;
using osu.Framework.Threading;
using osu.Game.Configuration;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
using osu.Game.Input;
Expand Down Expand Up @@ -77,6 +78,9 @@ public abstract partial class LoungeSubScreen : OnlinePlaySubScreen
[CanBeNull]
private LeasedBindable<Room> selectionLease;

[Resolved]
protected OsuConfigManager Config { get; private set; }

private readonly Bindable<FilterCriteria> filter = new Bindable<FilterCriteria>(new FilterCriteria());
private readonly IBindable<bool> operationInProgress = new Bindable<bool>();
private readonly IBindable<bool> isIdle = new BindableBool();
Expand Down
2 changes: 2 additions & 0 deletions osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@
using osu.Framework.Screens;
using osu.Framework.Graphics;
using osu.Framework.Graphics.UserInterface;
using osu.Game.Configuration;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API;
using osu.Game.Online.Multiplayer;
Expand Down Expand Up @@ -51,6 +52,7 @@ protected override IEnumerable<Drawable> CreateFilterControls()
roomAccessTypeDropdown = new SlimEnumDropdown<RoomPermissionsFilter>
{
RelativeSizeAxes = Axes.None,
Current = Config.GetBindable<RoomPermissionsFilter>(OsuSetting.MultiplayerRoomFilter),
Width = 160,
};

Expand Down