Fix SwitchHandler

rookiejava · Dec 27, 2021 · 9220850 · 9220850
1 parent 84cd5a5
commit 9220850
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Core/src/Handlers/Switch/SwitchHandler.Tizen.cs b/src/Core/src/Handlers/Switch/SwitchHandler.Tizen.cs
@@ -5,15 +5,20 @@ namespace Microsoft.Maui.Handlers
 {
 	public partial class SwitchHandler : ViewHandler<ISwitch, Check>
 	{
-		protected override Check CreateNativeView() => new Check(NativeParent);
+		protected override Check CreateNativeView() => new Check(NativeParent)
+		{
+			Style = "toggle"
+		};
 
 		protected override void ConnectHandler(Check nativeView)
 		{
+			base.ConnectHandler(nativeView);
 			nativeView!.StateChanged += OnStateChanged;
 		}
 
 		protected override void DisconnectHandler(Check nativeView)
 		{
+			base.DisconnectHandler(nativeView);
 			nativeView!.StateChanged -= OnStateChanged;
 		}
 

diff --git a/src/Core/src/Platform/Tizen/SwitchExtensions.cs b/src/Core/src/Platform/Tizen/SwitchExtensions.cs
@@ -12,8 +12,10 @@ public static void UpdateIsOn(this Check nativeCheck, ISwitch view)
 
 		public static void UpdateTrackColor(this Check nativeCheck, ISwitch view)
 		{
-			//TODO: need to consider default color
-			nativeCheck.Color = view.TrackColor.ToNativeEFL();
+			if (view.ThumbColor != null)
+			{
+				nativeCheck.Color = view.TrackColor.ToNativeEFL();
+			}
 		}
 
 		public static void UpdateThumbColor(this Check nativeCheck, ISwitch view)