sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 07:06:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into toquantity-1

Browse Source
This commit is contained in:
Dan Balasescu
2019-02-28 15:57:51 +09:00
committed by GitHub
parent 2241e1af9d 3a3c2ae21a
commit 3a1066ff02
316 changed files with 1140 additions and 720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
View File

@ -43,12 +43,14 @@ namespace osu.Game.Screens.Multi.Lounge.Components
public readonly Room Room;
private SelectionState state;
public SelectionState State
{
get { return state; }
get => state;
set
{
if (value == state) return;
state = value;
if (state == SelectionState.Selected)
@ -63,9 +65,10 @@ namespace osu.Game.Screens.Multi.Lounge.Components
public IEnumerable<string> FilterTerms => new[] { Room.Name.Value };
private bool matchingFilter;
public bool MatchingFilter
{
get { return matchingFilter; }
get => matchingFilter;
set
{
matchingFilter = value;

1
osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
View File

@ -54,6 +54,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
public enum PrimaryFilter
{
Open,
[Description("Recently Ended")]
RecentlyEnded,
Participated,