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

Merge branch 'master' into confine-during-gameplay

Browse Source 
# Conflicts:
#	osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
This commit is contained in:
Shane Woolcock
2020-10-07 11:07:00 +10:30
parent 478f2dec96 c803be2dd2
commit ec12a21088
46 changed files with 686 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@ namespace osu.Game.Configuration
yield return new SettingsSlider<float>
{
LabelText = attr.Label,
Bindable = bNumber,
Current = bNumber,
KeyboardStep = 0.1f,
};
@ -67,7 +67,7 @@ namespace osu.Game.Configuration
yield return new SettingsSlider<double>
{
LabelText = attr.Label,
Bindable = bNumber,
Current = bNumber,
KeyboardStep = 0.1f,
};
@ -77,7 +77,7 @@ namespace osu.Game.Configuration
yield return new SettingsSlider<int>
{
LabelText = attr.Label,
Bindable = bNumber
Current = bNumber
};
break;
@ -86,7 +86,7 @@ namespace osu.Game.Configuration
yield return new SettingsCheckbox
{
LabelText = attr.Label,
Bindable = bBool
Current = bBool
};
break;
@ -95,7 +95,7 @@ namespace osu.Game.Configuration
yield return new SettingsTextBox
{
LabelText = attr.Label,
Bindable = bString
Current = bString
};
break;
@ -105,7 +105,7 @@ namespace osu.Game.Configuration
var dropdown = (Drawable)Activator.CreateInstance(dropdownType);
dropdownType.GetProperty(nameof(SettingsDropdown<object>.LabelText))?.SetValue(dropdown, attr.Label);
dropdownType.GetProperty(nameof(SettingsDropdown<object>.Bindable))?.SetValue(dropdown, bindable);
dropdownType.GetProperty(nameof(SettingsDropdown<object>.Current))?.SetValue(dropdown, bindable);
yield return dropdown;