RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix selecting different tab causing filter to change by itself 

and minor cleanup
This commit is contained in:
Aergwyn 2017-12-25 14:17:35 +01:00
parent f00676e6ee
commit e2a1b18a2c
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Overlays/SocialOverlay.cs
View File

@ -64,12 +64,7 @@ public SocialOverlay()
// TODO sort our list in some way (either locally or with API call)
//Filter.DisplayStyleControl.Dropdown.Current.ValueChanged += rankStatus => Scheduler.AddOnce(updateSearch);
Header.Tabs.Current.ValueChanged += tab =>
{
currentQuery.Value = string.Empty;
Filter.Tabs.Current.Value = (SocialSortCriteria)Header.Tabs.Current.Value;
Scheduler.AddOnce(updateSearch);
};
Header.Tabs.Current.ValueChanged += _ => Scheduler.AddOnce(updateSearch);
currentQuery.ValueChanged += v =>
{
@ -86,7 +81,7 @@ public SocialOverlay()
currentQuery.BindTo(Filter.Search.Current);
Filter.Tabs.Current.ValueChanged += sortCriteria => Scheduler.AddOnce(updateSearch);
Filter.Tabs.Current.ValueChanged += _ => Scheduler.AddOnce(updateSearch);
Scheduler.AddOnce(updateSearch); // so it displays something once it's first opened
}
@ -99,9 +94,6 @@ private void load(APIAccess api)
private void recreatePanels(PanelDisplayStyle displayStyle)
{
if (Users == null)
return;
if (panels != null)
{
panels.FadeOut(200);
@ -109,6 +101,9 @@ private void recreatePanels(PanelDisplayStyle displayStyle)
panels = null;
}
if (Users == null)
return;
var newPanels = new FillFlowContainer<UserPanel>
{
RelativeSizeAxes = Axes.X,