From 47a3fac35fc515c6f583f1bb773466bf73a05663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9=20Larivi=C3=A8re?= Date: Wed, 19 Jan 2022 08:57:53 +0100 Subject: [PATCH] Make Slider and Stepper min/max a struct tuple --- src/Fabulous.XamarinForms/ViewUpdaters.fs | 4 ++-- src/Fabulous.XamarinForms/Xamarin.Forms.Core.Attributes.fs | 4 ++-- src/Fabulous.XamarinForms/Xamarin.Forms.Core.fs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Fabulous.XamarinForms/ViewUpdaters.fs b/src/Fabulous.XamarinForms/ViewUpdaters.fs index 4038ab8d0..7f7a18cc6 100644 --- a/src/Fabulous.XamarinForms/ViewUpdaters.fs +++ b/src/Fabulous.XamarinForms/ViewUpdaters.fs @@ -4,7 +4,7 @@ open Fabulous open Xamarin.Forms module ViewUpdaters = - let updateSliderMinMax (newValueOpt: (float * float) voption) (node: IViewNode) = + let updateSliderMinMax (newValueOpt: struct (float * float) voption) (node: IViewNode) = let slider = node.Target :?> Slider match newValueOpt with @@ -22,7 +22,7 @@ module ViewUpdaters = slider.SetValue(Slider.MinimumProperty, min) slider.SetValue(Slider.MaximumProperty, max) - let updateStepperMinMax (newValueOpt: (float * float) voption) (node: IViewNode) = + let updateStepperMinMax (newValueOpt: struct (float * float) voption) (node: IViewNode) = let stepper = node.Target :?> Stepper match newValueOpt with diff --git a/src/Fabulous.XamarinForms/Xamarin.Forms.Core.Attributes.fs b/src/Fabulous.XamarinForms/Xamarin.Forms.Core.Attributes.fs index d72cd65e1..b89f630cb 100644 --- a/src/Fabulous.XamarinForms/Xamarin.Forms.Core.Attributes.fs +++ b/src/Fabulous.XamarinForms/Xamarin.Forms.Core.Attributes.fs @@ -241,7 +241,7 @@ module Switch = module Slider = let MinimumMaximum = - Attributes.define "Slider_MinimumMaximum" ViewUpdaters.updateSliderMinMax + Attributes.define "Slider_MinimumMaximum" ViewUpdaters.updateSliderMinMax let Value = Attributes.defineBindable Xamarin.Forms.Slider.ValueProperty @@ -495,7 +495,7 @@ module Stepper = Attributes.defineBindable Xamarin.Forms.Stepper.IncrementProperty let MinimumMaximum = - Attributes.define "Stepper_MinimumMaximum" ViewUpdaters.updateStepperMinMax + Attributes.define "Stepper_MinimumMaximum" ViewUpdaters.updateStepperMinMax let Value = Attributes.defineBindable Xamarin.Forms.Stepper.ValueProperty diff --git a/src/Fabulous.XamarinForms/Xamarin.Forms.Core.fs b/src/Fabulous.XamarinForms/Xamarin.Forms.Core.fs index e9856825c..fe7d565a4 100644 --- a/src/Fabulous.XamarinForms/Xamarin.Forms.Core.fs +++ b/src/Fabulous.XamarinForms/Xamarin.Forms.Core.fs @@ -256,7 +256,7 @@ type ViewBuilders private () = ViewKeys.Slider, Slider.Value.WithValue(value), Slider.ValueChanged.WithValue(fun args -> onValueChanged args.NewValue |> box), - Slider.MinimumMaximum.WithValue(min, max) + Slider.MinimumMaximum.WithValue(struct (min, max)) ) static member inline ActivityIndicator<'msg>(isRunning: bool) = @@ -398,7 +398,7 @@ type ViewBuilders private () = ViewKeys.Stepper, Stepper.Value.WithValue(value), Stepper.ValueChanged.WithValue(fun args -> onValueChanged args.NewValue |> box), - Stepper.MinimumMaximum.WithValue((min, max)) + Stepper.MinimumMaximum.WithValue(struct (min, max)) ) static member inline ListView<'msg, 'itemData, 'itemMarker when 'itemMarker :> ICell>(items: seq<'itemData>) =