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

Merge branch 'master' into fix-transparent-background-on-screen-scale-modes

Browse Source
This commit is contained in:
Christian Kamphausen 2019-01-23 09:49:19 +01:00 committed by GitHub
commit 512e75982f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Settings/SettingsDropdown.cs
View File

@ -26,6 +26,8 @@ namespace osu.Game.Overlays.Settings
}
}
public override IEnumerable<string> FilterTerms => base.FilterTerms.Concat(Control.Items.Select(i => i.ToString()));
protected sealed override Drawable CreateControl() => CreateDropdown();
protected virtual OsuDropdown<T> CreateDropdown() => new DropdownControl { Items = Items };

2
osu.Game/Overlays/Settings/SettingsItem.cs
View File

@ -72,7 +72,7 @@ namespace osu.Game.Overlays.Settings
}
}
public IEnumerable<string> FilterTerms => new[] { LabelText };
public virtual IEnumerable<string> FilterTerms => new[] { LabelText };
public bool MatchingFilter
{