Update with framework bindable changes

This commit is contained in:
smoogipoo
2019-02-21 18:56:34 +09:00
parent d637b184e4
commit bca347427f
195 changed files with 567 additions and 555 deletions

View File

@ -34,8 +34,8 @@ namespace osu.Game.Overlays.Settings.Sections.Debug
};
configLatencyMode = config.GetBindable<GCLatencyMode>(DebugSetting.ActiveGCMode);
configLatencyMode.BindValueChanged(v => latencyMode.Value = (LatencyMode)v, true);
latencyMode.BindValueChanged(v => configLatencyMode.Value = (GCLatencyMode)v);
configLatencyMode.BindValueChanged(e => latencyMode.Value = (LatencyMode)e.NewValue, true);
latencyMode.BindValueChanged(e => configLatencyMode.Value = (GCLatencyMode)e.NewValue);
}
private enum LatencyMode

View File

@ -152,9 +152,9 @@ namespace osu.Game.Overlays.Settings.Sections.General
panel.Status.BindTo(api.LocalUser.Value.Status);
dropdown.Current.ValueChanged += newValue =>
dropdown.Current.ValueChanged += e =>
{
switch (newValue)
switch (e.NewValue)
{
case UserAction.Online:
api.LocalUser.Value.Status.Value = new UserStatusOnline();

View File

@ -127,9 +127,9 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
Bindable = sizeFullscreen
};
windowModeDropdown.Bindable.BindValueChanged(windowMode =>
windowModeDropdown.Bindable.BindValueChanged(e =>
{
if (windowMode == WindowMode.Fullscreen)
if (e.NewValue == WindowMode.Fullscreen)
{
resolutionDropdown.Show();
sizeFullscreen.TriggerChange();
@ -139,15 +139,15 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
}, true);
}
scalingMode.BindValueChanged(mode =>
scalingMode.BindValueChanged(e =>
{
scalingSettings.ClearTransforms();
scalingSettings.AutoSizeAxes = mode != ScalingMode.Off ? Axes.Y : Axes.None;
scalingSettings.AutoSizeAxes = e.NewValue != ScalingMode.Off ? Axes.Y : Axes.None;
if (mode == ScalingMode.Off)
if (e.NewValue == ScalingMode.Off)
scalingSettings.ResizeHeightTo(0, transition_duration, Easing.OutQuint);
scalingSettings.ForEach(s => s.TransferValueOnCommit = mode == ScalingMode.Everything);
scalingSettings.ForEach(s => s.TransferValueOnCommit = e.NewValue == ScalingMode.Everything);
}, true);
}
@ -158,7 +158,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
/// <returns>A bindable which will propagate updates with a delay.</returns>
private void bindPreviewEvent(Bindable<float> bindable)
{
bindable.ValueChanged += v =>
bindable.ValueChanged += e =>
{
switch (scalingMode.Value)
{

View File

@ -55,19 +55,19 @@ namespace osu.Game.Overlays.Settings.Sections.Input
},
};
rawInputToggle.ValueChanged += enabled =>
rawInputToggle.ValueChanged += e =>
{
// this is temporary until we support per-handler settings.
const string raw_mouse_handler = @"OsuTKRawMouseHandler";
const string standard_mouse_handler = @"OsuTKMouseHandler";
ignoredInputHandler.Value = enabled ? standard_mouse_handler : raw_mouse_handler;
ignoredInputHandler.Value = e.NewValue ? standard_mouse_handler : raw_mouse_handler;
};
ignoredInputHandler = config.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers);
ignoredInputHandler.ValueChanged += handler =>
ignoredInputHandler.ValueChanged += e =>
{
bool raw = !handler.Contains("Raw");
bool raw = !e.NewValue.Contains("Raw");
rawInputToggle.Value = raw;
sensitivity.Bindable.Disabled = !raw;
};

View File

@ -76,8 +76,8 @@ namespace osu.Game.Overlays.Settings.Sections
if (skinDropdown.Items.All(s => s.ID != configBindable.Value))
configBindable.Value = 0;
configBindable.BindValueChanged(v => dropdownBindable.Value = skinDropdown.Items.Single(s => s.ID == v), true);
dropdownBindable.BindValueChanged(v => configBindable.Value = v.ID);
configBindable.BindValueChanged(e => dropdownBindable.Value = skinDropdown.Items.Single(s => s.ID == e.NewValue), true);
dropdownBindable.BindValueChanged(e => configBindable.Value = e.NewValue.ID);
}
private void itemRemoved(SkinInfo s) => Schedule(() => skinDropdown.Items = skinDropdown.Items.Where(i => i.ID != s.ID).ToArray());

View File

@ -119,7 +119,7 @@ namespace osu.Game.Overlays.Settings
set
{
bindable = value;
bindable.ValueChanged += newValue => UpdateState();
bindable.ValueChanged += e => UpdateState();
bindable.DisabledChanged += disabled => UpdateState();
}
}