sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 14:46:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dean Herbert
2017-03-16 14:23:48 +09:00
parent 269c1a5e5c
commit da6b98db10
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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