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

Revert changes to SettingsSourceAttribute class

Browse Source
This commit is contained in:
Dean Herbert
2021-03-18 21:16:50 +09:00
parent e59b8b4ce6
commit c694deb7d6
1 changed files with 2 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
osu.Game/Configuration/SettingSourceAttribute.cs
View File

@ -5,10 +5,8 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using Humanizer;
using JetBrains.Annotations; using JetBrains.Annotations;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Extensions.TypeExtensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Game.Overlays.Settings; using osu.Game.Overlays.Settings;
@ -63,21 +61,12 @@ namespace osu.Game.Configuration
public static class SettingSourceExtensions public static class SettingSourceExtensions
{ {
public static IReadOnlyList<Drawable> CreateSettingsControls(this object obj, bool includeDisabled = true) => public static IEnumerable<Drawable> CreateSettingsControls(this object obj)
createSettingsControls(obj, obj.GetOrderedSettingsSourceProperties(), includeDisabled).ToArray();
public static IReadOnlyList<Drawable> CreateSettingsControlsFromAllBindables(this object obj, bool includeDisabled = true) =>
createSettingsControls(obj, obj.GetSettingsSourcePropertiesFromBindables(), includeDisabled).ToArray();
private static IEnumerable<Drawable> createSettingsControls(object obj, IEnumerable<(SettingSourceAttribute, PropertyInfo)> sourceAttribs, bool includeDisabled = true)
{ {
foreach (var (attr, property) in sourceAttribs) foreach (var (attr, property) in obj.GetOrderedSettingsSourceProperties())
{ {
object value = property.GetValue(obj); object value = property.GetValue(obj);
if ((value as IBindable)?.Disabled == true)
continue;
switch (value) switch (value)
{ {
case BindableNumber<float> bNumber: case BindableNumber<float> bNumber:
@ -150,30 +139,6 @@ namespace osu.Game.Configuration
} }
} }
public static IEnumerable<(SettingSourceAttribute, PropertyInfo)> GetSettingsSourcePropertiesFromBindables(this object obj)
{
HashSet<string> handledProperties = new HashSet<string>();
// reverse and de-dupe properties to surface base class settings to the top of return order.
foreach (var type in obj.GetType().EnumerateBaseTypes().Reverse())
{
foreach (var property in type.GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance))
{
if (handledProperties.Contains(property.Name))
continue;
handledProperties.Add(property.Name);
if (typeof(IBindable).IsAssignableFrom(property.PropertyType))
{
var val = property.GetValue(obj);
string description = (val as IHasDescription)?.Description ?? string.Empty;
yield return (new SettingSourceAttribute(property.Name.Humanize(), description), property);
}
}
}
}
public static IEnumerable<(SettingSourceAttribute, PropertyInfo)> GetSettingsSourceProperties(this object obj) public static IEnumerable<(SettingSourceAttribute, PropertyInfo)> GetSettingsSourceProperties(this object obj)
{ {
foreach (var property in obj.GetType().GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance)) foreach (var property in obj.GetType().GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance))