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

Change panel selection logic to avoid looping.

Browse Source
This commit is contained in:
Dean Herbert 2016-10-27 13:36:04 +09:00
parent ba5b2f2d73
commit ce73ae792f
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Beatmaps/Drawable/BeatmapGroup.cs
View File

@ -25,7 +25,7 @@ namespace osu.Game.Beatmaps.Drawable
private const float collapsedAlpha = 0.5f; private const float collapsedAlpha = 0.5f;
private const float collapsedWidth = 0.8f; private const float collapsedWidth = 0.8f;
private BeatmapInfo selectedBeatmap; private BeatmapPanel selectedPanel;
/// <summary> /// <summary>
/// Fires when one of our difficulties was selected. Will fire on first expand. /// Fires when one of our difficulties was selected. Will fire on first expand.
@ -53,9 +53,9 @@ namespace osu.Game.Beatmaps.Drawable
header.GlowRadius = 5; header.GlowRadius = 5;
header.BorderColour = new Color4(header.BorderColour.R, header.BorderColour.G, header.BorderColour.B, 255); header.BorderColour = new Color4(header.BorderColour.R, header.BorderColour.G, header.BorderColour.B, 255);
if (selectedBeatmap == null) if (selectedPanel == null)
(difficulties.Children.FirstOrDefault() as BeatmapPanel).Selected = true; (difficulties.Children.FirstOrDefault() as BeatmapPanel).Selected = true;
SelectionChanged?.Invoke(this, selectedBeatmap); SelectionChanged?.Invoke(this, selectedPanel?.Beatmap);
break; break;
case GroupState.Collapsed: case GroupState.Collapsed:
FadeTo(collapsedAlpha, 250); FadeTo(collapsedAlpha, 250);
@ -122,14 +122,12 @@ namespace osu.Game.Beatmaps.Drawable
State = GroupState.Collapsed; State = GroupState.Collapsed;
} }
private void panelGainedSelection(BeatmapInfo map) private void panelGainedSelection(BeatmapPanel panel)
{ {
selectedBeatmap = map; if (selectedPanel != null) selectedPanel.Selected = false;
selectedPanel = panel;
foreach (BeatmapPanel panel in difficulties.Children)
if (panel.Beatmap != map) panel.Selected = false;
SelectionChanged?.Invoke(this, map); SelectionChanged?.Invoke(this, panel.Beatmap);
} }
protected override bool OnClick(InputState state) protected override bool OnClick(InputState state)

4
osu.Game/Beatmaps/Drawable/BeatmapPanel.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Beatmaps.Drawable
{ {
public BeatmapInfo Beatmap; public BeatmapInfo Beatmap;
public Action<BeatmapInfo> GainedSelection; public Action<BeatmapPanel> GainedSelection;
private bool selected; private bool selected;
@ -38,7 +38,7 @@ namespace osu.Game.Beatmaps.Drawable
selected ? 255 : 0); selected ? 255 : 0);
GlowRadius = selected ? 3 : 0; GlowRadius = selected ? 3 : 0;
if (selected) GainedSelection?.Invoke(Beatmap); if (selected) GainedSelection?.Invoke(this);
} }
} }