h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 09:22:54 +08:00
Code Issues Releases Wiki Activity

Update difficulty icons on headers to match filtered difficulties

Browse Source
This commit is contained in:
Dean Herbert 2017-12-11 20:49:27 +09:00
parent f58c554d19
commit 970e55fc4a
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
View File

@ -2,6 +2,7 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System; using System;
using osu.Framework.Configuration;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour; using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
@ -61,7 +62,7 @@ namespace osu.Game.Beatmaps.Drawables
return base.OnClick(state); return base.OnClick(state);
} }
public bool Filtered { get; set; } public BindableBool Filtered = new BindableBool();
protected override void ApplyState(PanelSelectedState last = PanelSelectedState.Hidden) protected override void ApplyState(PanelSelectedState last = PanelSelectedState.Hidden)
{ {

17
osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
View File

@ -7,6 +7,7 @@ using System.Linq;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour; using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
@ -157,8 +158,7 @@ namespace osu.Game.Beatmaps.Drawables
if (panels == null) if (panels == null)
throw new ArgumentNullException(nameof(panels)); throw new ArgumentNullException(nameof(panels));
foreach (var p in panels) difficultyIcons.AddRange(panels.Select(p => new FilterableDifficultyIcon(p)));
difficultyIcons.Add(new DifficultyIcon(p.Beatmap));
} }
public MenuItem[] ContextMenuItems public MenuItem[] ContextMenuItems
@ -178,5 +178,18 @@ namespace osu.Game.Beatmaps.Drawables
return items.ToArray(); return items.ToArray();
} }
} }
public class FilterableDifficultyIcon : DifficultyIcon
{
private readonly BindableBool filtered = new BindableBool();
public FilterableDifficultyIcon(BeatmapPanel panel)
: base(panel.Beatmap)
{
filtered.BindTo(panel.Filtered);
filtered.ValueChanged += v => this.FadeTo(v ? 0.1f : 1, 100);
filtered.TriggerChange();
}
}
} }
} }

2
osu.Game/Screens/Select/FilterCriteria.cs
View File

@ -37,7 +37,7 @@ namespace osu.Game.Screens.Select
match &= set.Metadata.SearchableTerms.Any(term => term.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) >= 0); match &= set.Metadata.SearchableTerms.Any(term => term.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) >= 0);
foreach (var panel in g.BeatmapPanels) foreach (var panel in g.BeatmapPanels)
panel.Filtered = !canConvert(panel.Beatmap); panel.Filtered.Value = !canConvert(panel.Beatmap);
switch (g.State) switch (g.State)
{ {