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

Use TransferOnCommit

Browse Source
This commit is contained in:
Dean Herbert
2019-01-08 13:48:38 +09:00
parent 199b614eba
commit 01aa4c2a72
2 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
View File

@ -7,9 +7,11 @@ using System.Drawing;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Configuration; using osu.Framework.Configuration;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.UserInterface;
using osu.Framework.Threading; using osu.Framework.Threading;
using osu.Game.Configuration; using osu.Game.Configuration;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
@ -23,7 +25,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
{ {
protected override string Header => "Layout"; protected override string Header => "Layout";
private FillFlowContainer scalingSettings; private FillFlowContainer<SettingsSlider<float>> scalingSettings;
private Bindable<ScalingMode> scalingMode; private Bindable<ScalingMode> scalingMode;
private Bindable<Size> sizeFullscreen; private Bindable<Size> sizeFullscreen;
@ -70,7 +72,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
LabelText = "Scaling", LabelText = "Scaling",
Bindable = osuConfig.GetBindable<ScalingMode>(OsuSetting.Scaling), Bindable = osuConfig.GetBindable<ScalingMode>(OsuSetting.Scaling),
}, },
scalingSettings = new FillFlowContainer scalingSettings = new FillFlowContainer<SettingsSlider<float>>
{ {
Direction = FillDirection.Vertical, Direction = FillDirection.Vertical,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
@ -78,36 +80,38 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
AutoSizeDuration = transition_duration, AutoSizeDuration = transition_duration,
AutoSizeEasing = Easing.OutQuint, AutoSizeEasing = Easing.OutQuint,
Masking = true, Masking = true,
Children = new Drawable[] Children = new []
{ {
new SettingsSlider<float> new SettingsSlider<float>
{ {
LabelText = "Horizontal position", LabelText = "Horizontal position",
Bindable = delayedBindable(scalingPositionX), Bindable = scalingPositionX,
KeyboardStep = 0.01f KeyboardStep = 0.01f
}, },
new SettingsSlider<float> new SettingsSlider<float>
{ {
LabelText = "Vertical position", LabelText = "Vertical position",
Bindable = delayedBindable(scalingPositionY), Bindable = scalingPositionY,
KeyboardStep = 0.01f KeyboardStep = 0.01f
}, },
new SettingsSlider<float> new SettingsSlider<float>
{ {
LabelText = "Horizontal scale", LabelText = "Horizontal scale",
Bindable = delayedBindable(scalingSizeX), Bindable = scalingSizeX,
KeyboardStep = 0.01f KeyboardStep = 0.01f
}, },
new SettingsSlider<float> new SettingsSlider<float>
{ {
LabelText = "Vertical scale", LabelText = "Vertical scale",
Bindable = delayedBindable(scalingSizeY), Bindable = scalingSizeY,
KeyboardStep = 0.01f KeyboardStep = 0.01f
}, },
} }
}, },
}; };
scalingSettings.ForEach(s => bindPreviewEvent(s.Bindable));
var resolutions = getResolutions(); var resolutions = getResolutions();
if (resolutions.Count > 1) if (resolutions.Count > 1)
@ -139,35 +143,27 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
if (mode == ScalingMode.Off) if (mode == ScalingMode.Off)
scalingSettings.ResizeHeightTo(0, transition_duration, Easing.OutQuint); scalingSettings.ResizeHeightTo(0, transition_duration, Easing.OutQuint);
scalingSettings.ForEach(s => ((SliderBar<float>)s.Control).TransferValueOnCommit = mode == ScalingMode.Everything);
}, true); }, true);
} }
/// <summary> /// <summary>
/// Create a delayed bindable which only updates when a condition is met. /// Create a delayed bindable which only updates when a condition is met.
/// </summary> /// </summary>
/// <param name="configBindable">The config bindable.</param> /// <param name="bindable">The config bindable.</param>
/// <returns>A bindable which will propagate updates with a delay.</returns> /// <returns>A bindable which will propagate updates with a delay.</returns>
private Bindable<float> delayedBindable(Bindable<float> configBindable) private void bindPreviewEvent(Bindable<float> bindable)
{ {
var delayed = new BindableFloat { MinValue = 0, MaxValue = 1, Default = configBindable.Default }; bindable.ValueChanged += v =>
configBindable.BindValueChanged(v => delayed.Value = v, true);
delayed.ValueChanged += v =>
{ {
switch (scalingMode.Value) switch (scalingMode.Value)
{ {
case ScalingMode.Everything:
applyWithDelay(() => configBindable.Value = v);
return;
case ScalingMode.Gameplay: case ScalingMode.Gameplay:
showPreview(); showPreview();
break; break;
} }
configBindable.Value = v;
}; };
return delayed;
} }
private Drawable preview; private Drawable preview;

2
osu.Game/Overlays/Settings/SettingsItem.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Overlays.Settings
{ {
protected abstract Drawable CreateControl(); protected abstract Drawable CreateControl();
protected Drawable Control { get; } public Drawable Control { get; }
private IHasCurrentValue<T> controlWithCurrent => Control as IHasCurrentValue<T>; private IHasCurrentValue<T> controlWithCurrent => Control as IHasCurrentValue<T>;