From ab671525cba8c91f7aabe2cad0e18a8ebafc348c Mon Sep 17 00:00:00 2001 From: rajamatt Date: Thu, 9 May 2024 14:58:47 -0400 Subject: [PATCH] defaults --- src/Uno.Toolkit.UI/Behaviors/InputExtensions.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Uno.Toolkit.UI/Behaviors/InputExtensions.cs b/src/Uno.Toolkit.UI/Behaviors/InputExtensions.cs index b2103f580..9f085fdb4 100644 --- a/src/Uno.Toolkit.UI/Behaviors/InputExtensions.cs +++ b/src/Uno.Toolkit.UI/Behaviors/InputExtensions.cs @@ -47,13 +47,15 @@ public enum ReturnType { /// /// Backing property for what type of return the soft-keyboard will show. /// - public static DependencyProperty ReturnTypeProperty { get; } = DependencyProperty.RegisterAttached( + public static DependencyProperty ReturnTypeProperty { [DynamicDependency(nameof(GetReturnType))] get; } = DependencyProperty.RegisterAttached( "ReturnType", typeof(ReturnType), typeof(InputExtensions), new PropertyMetadata(ReturnType.Default, OnReturnTypeChanged)); + [DynamicDependency(nameof(SetReturnType))] public static ReturnType GetReturnType(DependencyObject obj) => (ReturnType)obj.GetValue(ReturnTypeProperty); + [DynamicDependency(nameof(GetReturnType))] public static void SetReturnType(DependencyObject obj, ReturnType value) => obj.SetValue(ReturnTypeProperty, value); #endregion @@ -243,13 +245,13 @@ private static ImeAction GetImeActionFromReturnType(ReturnType returnType) { switch (returnType) { + case ReturnType.Next: return ImeAction.Next; case ReturnType.Go: return ImeAction.Go; case ReturnType.Search: return ImeAction.Search; case ReturnType.Send: return ImeAction.Send; case ReturnType.Done: return ImeAction.Done; case ReturnType.Default: - case ReturnType.Next: - default: return ImeAction.Next; + default: return ImeAction.Unspecified; } } #endif @@ -259,13 +261,13 @@ private static UIReturnKeyType GetReturnKeyTypeFromReturnType(ReturnType returnT { switch (returnType) { + case ReturnType.Next: return UIReturnKeyType.Next; case ReturnType.Go: return UIReturnKeyType.Go; case ReturnType.Search: return UIReturnKeyType.Search; case ReturnType.Send: return UIReturnKeyType.Send; case ReturnType.Done: return UIReturnKeyType.Done; case ReturnType.Default: - case ReturnType.Next: - default: return UIReturnKeyType.Next; + default: return UIReturnKeyType.Default; } } #endif