summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41619.cs62
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems1
-rw-r--r--Xamarin.Forms.Platform.WinRT/SliderRenderer.cs12
3 files changed, 69 insertions, 6 deletions
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41619.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41619.cs
new file mode 100644
index 00000000..24c277de
--- /dev/null
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41619.cs
@@ -0,0 +1,62 @@
+using Xamarin.Forms.CustomAttributes;
+using Xamarin.Forms.Internals;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+#if UITEST
+using Xamarin.UITest;
+using NUnit.Framework;
+#endif
+
+namespace Xamarin.Forms.Controls.Issues
+{
+ [Preserve(AllMembers = true)]
+ [Issue(IssueTracker.Bugzilla, 41619, "[WinRT/UWP] Slider binding works incorrectly", PlatformAffected.WinRT)]
+ public class Bugzilla41619 : TestContentPage
+ {
+ protected override void Init()
+ {
+ var vm = new Bugzilla41619ViewModel { SliderValue = 5 };
+ BindingContext = vm;
+ var label = new Label();
+ label.SetBinding(Label.TextProperty, "SliderValue");
+ var slider = new Slider
+ {
+ Maximum = 10,
+ Minimum = 1,
+ };
+ slider.SetBinding(Slider.ValueProperty, "SliderValue", BindingMode.TwoWay);
+ Content = new StackLayout
+ {
+ Children =
+ {
+ label,
+ slider,
+ new Label { Text = "The initial slider value above should be 5." }
+ }
+ };
+ }
+
+ class Bugzilla41619ViewModel : INotifyPropertyChanged
+ {
+ private double _sliderValue;
+
+ public double SliderValue
+ {
+ get { return _sliderValue; }
+ set
+ {
+ _sliderValue = value;
+ OnPropertyChanged();
+ }
+ }
+
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+ {
+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
index 0ca65acd..20fd7fae 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
@@ -127,6 +127,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Bugzilla41415.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Bugzilla41418.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Bugzilla41424.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Bugzilla41619.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Bugzilla42069.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Bugzilla42069_Page.xaml.cs">
<DependentUpon>Bugzilla42069_Page.xaml</DependentUpon>
diff --git a/Xamarin.Forms.Platform.WinRT/SliderRenderer.cs b/Xamarin.Forms.Platform.WinRT/SliderRenderer.cs
index cf188f15..0fff1496 100644
--- a/Xamarin.Forms.Platform.WinRT/SliderRenderer.cs
+++ b/Xamarin.Forms.Platform.WinRT/SliderRenderer.cs
@@ -24,7 +24,11 @@ namespace Xamarin.Forms.Platform.WinRT
var slider = new Windows.UI.Xaml.Controls.Slider();
SetNativeControl(slider);
- slider.ValueChanged += OnNativeValueCHanged;
+ Control.Minimum = e.NewElement.Minimum;
+ Control.Maximum = e.NewElement.Maximum;
+ Control.Value = e.NewElement.Value;
+
+ slider.ValueChanged += OnNativeValueChanged;
// Even when using Center/CenterAndExpand, a Slider has an oddity where it looks
// off-center in its layout by a smidge. The default templates are slightly different
@@ -49,10 +53,6 @@ namespace Xamarin.Forms.Platform.WinRT
double stepping = Math.Min((e.NewElement.Maximum - e.NewElement.Minimum) / 10, 1);
Control.StepFrequency = stepping;
Control.SmallChange = stepping;
-
- Control.Minimum = e.NewElement.Minimum;
- Control.Maximum = e.NewElement.Maximum;
- Control.Value = e.NewElement.Value;
}
}
@@ -71,7 +71,7 @@ namespace Xamarin.Forms.Platform.WinRT
}
}
- void OnNativeValueCHanged(object sender, RangeBaseValueChangedEventArgs e)
+ void OnNativeValueChanged(object sender, RangeBaseValueChangedEventArgs e)
{
((IElementController)Element).SetValueFromRenderer(Slider.ValueProperty, e.NewValue);
}