sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 08:49:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Simplify SelectedMods.

Browse Source
This commit is contained in:
Huo Yaoyuan
2017-03-06 15:31:37 +08:00
parent a7d7abe70e
commit a34e6453bf
2 changed files with 3 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Overlays/Mods/ModSection.cs
View File

@ -2,7 +2,6 @@
// 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 System.Collections.Generic;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
using OpenTK.Input; using OpenTK.Input;
@ -30,23 +29,6 @@ namespace osu.Game.Overlays.Mods
public Action<Mod> Action; public Action<Mod> Action;
protected virtual Key[] ToggleKeys => new Key[] { }; protected virtual Key[] ToggleKeys => new Key[] { };
public Mod[] SelectedMods
{
get
{
List<Mod> selectedMods = new List<Mod>();
foreach (ModButton button in Buttons)
{
Mod selectedMod = button.SelectedMod;
if (selectedMod != null)
selectedMods.Add(selectedMod);
}
return selectedMods.ToArray();
}
}
private string header; private string header;
public string Header public string Header
{ {

15
osu.Game/Overlays/Mods/ModSelectOverlay.cs
View File

@ -3,7 +3,6 @@
using System; using System;
using System.Linq; using System.Linq;
using System.Collections.Generic;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
using osu.Framework.Configuration; using osu.Framework.Configuration;
@ -71,7 +70,7 @@ namespace osu.Game.Overlays.Mods
}; };
} }
[BackgroundDependencyLoader(permitNulls:true)] [BackgroundDependencyLoader(permitNulls: true)]
private void load(OsuColour colours, OsuGame osu) private void load(OsuColour colours, OsuGame osu)
{ {
lowMultiplierColour = colours.Red; lowMultiplierColour = colours.Red;
@ -189,17 +188,7 @@ namespace osu.Game.Overlays.Mods
private void refreshSelectedMods() private void refreshSelectedMods()
{ {
List<Mod> selectedMods = new List<Mod>(); SelectedMods.Value = modSectionsContainer.Children.SelectMany(s => s.Buttons.Select(x => x.SelectedMod).Where(x => x != null)).ToArray();
foreach (ModSection section in modSectionsContainer.Children)
{
foreach (Mod mod in section.SelectedMods)
{
selectedMods.Add(mod);
}
}
SelectedMods.Value = selectedMods.ToArray();
} }
public ModSelectOverlay() public ModSelectOverlay()