From b7cfdff8d13be4cde6640b638dd60b0579df0baa Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 10 Apr 2017 15:30:17 +0900 Subject: [PATCH] Update SliderBar to use IHasCurrentValue. --- osu-framework | 2 +- osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs | 2 +- osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs | 2 +- osu.Game/Overlays/Options/OptionSlider.cs | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/osu-framework b/osu-framework index bbfd0fc7a8..561b24bed4 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit bbfd0fc7a8f5293a0f853f51040b40808abbb459 +Subproject commit 561b24bed48d3670b1d33acfc7ba5e11dcd3ac0c diff --git a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs index 99da7d1c73..b14607f235 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs @@ -112,7 +112,7 @@ namespace osu.Desktop.VisualTests.Tests Width = 150, Height = 10, SelectionColor = Color4.Orange, - Value = playbackSpeed + Current = playbackSpeed } } }); diff --git a/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs b/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs index 7e7782662b..d41da04b3e 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs @@ -57,7 +57,7 @@ namespace osu.Desktop.VisualTests.Tests Width = 150, Height = 10, SelectionColor = Color4.Orange, - Value = bindable + Current = bindable } } }); diff --git a/osu.Game/Overlays/Options/OptionSlider.cs b/osu.Game/Overlays/Options/OptionSlider.cs index 8fa9bf063d..1cd9fdc60c 100644 --- a/osu.Game/Overlays/Options/OptionSlider.cs +++ b/osu.Game/Overlays/Options/OptionSlider.cs @@ -27,12 +27,12 @@ namespace osu.Game.Overlays.Options } } - public BindableNumber Bindable + public Bindable Bindable { - get { return slider.Value; } + get { return slider.Current; } set { - slider.Value = value; + slider.Current = value; if (value?.Disabled ?? true) Alpha = 0.3f; }