h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 20:07:29 +08:00
Code Issues 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>
protected readonly Footer Footer;
private FilterControl filter;
public FilterControl Filter
{
get
{
return filter;
}
private set
{
if (filter != value)
{
filter = value;
filterChanged();
}
}
}
private FilterControl filterControl;
protected SongSelect()
{
@ -109,7 +94,7 @@ namespace osu.Game.Screens.Select
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
});
Add(filter = new FilterControl(filter_height)
Add(filterControl = new FilterControl(filter_height)
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
@ -198,9 +183,9 @@ namespace osu.Game.Screens.Select
filterTask = Scheduler.AddDelayed(() =>
{
filterTask = null;
var search = filter.Search;
var search = filterControl.Search;
BeatmapGroup newSelection = null;
carousel.Sort(filter.Sort);
carousel.Sort(filterControl.Sort);
foreach (var beatmapGroup in carousel)
{
var set = beatmapGroup.BeatmapSet;
@ -257,7 +242,7 @@ namespace osu.Game.Screens.Select
beatmapInfoWedge.State = Visibility.Visible;
filter.Activate();
filterControl.Activate();
}
protected override void OnResuming(Screen last)
@ -270,7 +255,7 @@ namespace osu.Game.Screens.Select
Content.ScaleTo(1, 250, EasingTypes.OutSine);
filter.Activate();
filterControl.Activate();
}
protected override void OnSuspending(Screen next)
@ -279,7 +264,7 @@ namespace osu.Game.Screens.Select
Content.FadeOut(250);
filter.Deactivate();
filterControl.Deactivate();
base.OnSuspending(next);
}
@ -289,7 +274,7 @@ namespace osu.Game.Screens.Select
Content.FadeOut(100);
filter.Deactivate();
filterControl.Deactivate();
return base.OnExiting(next);
}