sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-09 23:57:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Filter doesn't need to be public, nor have a property.

Browse Source
This commit is contained in:
Dean Herbert 2017-03-16 14:08:05 +09:00
parent 4d84bf7350
commit 352de22590
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
1 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
osu.Game/Screens/Select/SongSelect.cs
View File

@ -65,22 +65,7 @@ namespace osu.Game.Screens.Select
/// </summary> /// </summary>
protected readonly Footer Footer; protected readonly Footer Footer;
private FilterControl filter; private FilterControl filterControl;
public FilterControl Filter
{
get
{
return filter;
}
private set
{
if (filter != value)
{
filter = value;
filterChanged();
}
}
}
protected SongSelect() protected SongSelect()
{ {
@ -109,7 +94,7 @@ namespace osu.Game.Screens.Select
Anchor = Anchor.CentreRight, Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight, Origin = Anchor.CentreRight,
}); });
Add(filter = new FilterControl(filter_height) Add(filterControl = new FilterControl(filter_height)
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
@ -198,9 +183,9 @@ namespace osu.Game.Screens.Select
filterTask = Scheduler.AddDelayed(() => filterTask = Scheduler.AddDelayed(() =>
{ {
filterTask = null; filterTask = null;
var search = filter.Search; var search = filterControl.Search;
BeatmapGroup newSelection = null; BeatmapGroup newSelection = null;
carousel.Sort(filter.Sort); carousel.Sort(filterControl.Sort);
foreach (var beatmapGroup in carousel) foreach (var beatmapGroup in carousel)
{ {
var set = beatmapGroup.BeatmapSet; var set = beatmapGroup.BeatmapSet;
@ -257,7 +242,7 @@ namespace osu.Game.Screens.Select
beatmapInfoWedge.State = Visibility.Visible; beatmapInfoWedge.State = Visibility.Visible;
filter.Activate(); filterControl.Activate();
} }
protected override void OnResuming(Screen last) protected override void OnResuming(Screen last)
@ -270,7 +255,7 @@ namespace osu.Game.Screens.Select
Content.ScaleTo(1, 250, EasingTypes.OutSine); Content.ScaleTo(1, 250, EasingTypes.OutSine);
filter.Activate(); filterControl.Activate();
} }
protected override void OnSuspending(Screen next) protected override void OnSuspending(Screen next)
@ -279,7 +264,7 @@ namespace osu.Game.Screens.Select
Content.FadeOut(250); Content.FadeOut(250);
filter.Deactivate(); filterControl.Deactivate();
base.OnSuspending(next); base.OnSuspending(next);
} }
@ -289,7 +274,7 @@ namespace osu.Game.Screens.Select
Content.FadeOut(100); Content.FadeOut(100);
filter.Deactivate(); filterControl.Deactivate();
return base.OnExiting(next); return base.OnExiting(next);
} }