From b9ca4d3ebe1bfb3b23cac21891b8b4547c5c14a0 Mon Sep 17 00:00:00 2001 From: David <15479248+davepruitt@users.noreply.github.com> Date: Thu, 27 Apr 2023 00:07:23 -0600 Subject: [PATCH] Fixing two issues with the ToggleSwitch control: (1) The ToggleSwitch would still react to user interactions even if disabled (tested on Android 13), and (2) the ToggleSwitch's visual appearance did not match its actual value upon initialization. --- src/AlohaKit/Controls/ToggleSwitch/ToggleSwitch.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/AlohaKit/Controls/ToggleSwitch/ToggleSwitch.cs b/src/AlohaKit/Controls/ToggleSwitch/ToggleSwitch.cs index a4f5884..81473d6 100644 --- a/src/AlohaKit/Controls/ToggleSwitch/ToggleSwitch.cs +++ b/src/AlohaKit/Controls/ToggleSwitch/ToggleSwitch.cs @@ -134,6 +134,8 @@ void UpdateIsOn() Toggled?.Invoke(this, new ToggledEventArgs(IsOn)); Invalidate(); + + AnimateToggle(); } void UpdateHasShadow() @@ -148,9 +150,10 @@ void UpdateHasShadow() void OnToggleSwitchStartInteraction(object sender, TouchEventArgs e) { - IsOn = !IsOn; - - AnimateToggle(); + if (IsEnabled) + { + IsOn = !IsOn; + } } void AnimateToggle()