From 92208506ce546ef8e03a2d713003206bf7beb3db Mon Sep 17 00:00:00 2001 From: Kangho Hur Date: Fri, 2 Jul 2021 10:22:47 +0900 Subject: [PATCH] Fix SwitchHandler --- src/Core/src/Handlers/Switch/SwitchHandler.Tizen.cs | 7 ++++++- src/Core/src/Platform/Tizen/SwitchExtensions.cs | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Core/src/Handlers/Switch/SwitchHandler.Tizen.cs b/src/Core/src/Handlers/Switch/SwitchHandler.Tizen.cs index 6d2dada6b899..8c7ab0ecb485 100644 --- 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 { - 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 index 101ec8c1bccb..49e0c5fc67cb 100644 --- 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)